From 0f746d488aee1bbf8b9f20a65c56f0c53b6ed186 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 10 Mar 2021 18:34:42 +0000 Subject: [PATCH] Stop calling deprecated getFlags See https://skia-review.googlesource.com/c/skia/+/382702 Change-Id: I3c2208c85846b6f523246f8ac0548205584c2359 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2749175 Reviewed-by: Florin Malita Reviewed-by: vmpstr Commit-Queue: Mike Reed Cr-Commit-Position: refs/heads/master@{#861630} --- cc/paint/paint_flags.cc | 2 +- skia/ext/benchmarking_canvas.cc | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cc/paint/paint_flags.cc b/cc/paint/paint_flags.cc index 62f41a0170747e..a55e680b0a7ff3 100644 --- a/cc/paint/paint_flags.cc +++ b/cc/paint/paint_flags.cc @@ -11,7 +11,7 @@ namespace { static bool affects_alpha(const SkColorFilter* cf) { - return cf && !(cf->getFlags() & SkColorFilter::kAlphaUnchanged_Flag); + return cf && !cf->isAlphaUnchanged(); } } // namespace diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc index cefad19c54ad40..be76da8bd0c430 100644 --- a/skia/ext/benchmarking_canvas.cc +++ b/skia/ext/benchmarking_canvas.cc @@ -137,10 +137,9 @@ std::unique_ptr AsValue(SkCanvas::PointMode mode) { std::unique_ptr AsValue(const SkColorFilter& filter) { std::unique_ptr val(new base::DictionaryValue()); - if (unsigned flags = filter.getFlags()) { + if (filter.isAlphaUnchanged()) { FlagsBuilder builder('|'); - builder.addFlag(flags & SkColorFilter::kAlphaUnchanged_Flag, - "kAlphaUnchanged_Flag"); + builder.addFlag(true, "kAlphaUnchanged_Flag"); val->SetString("flags", builder.str()); }