commit 7991594c1c4ce763fa831a15f716f9386f93e4df
author Mike Reed <reed@google.com> Fri Jun 26 09:05:10 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 26 14:51:20 2020 +0000
tree 6673f483751b52990c5a46879fdfe4f2d606f4db
parent 96ead54a69ce51612083a608e7efc91435aa2633

Revert "Revert "clean up after big refactor of SkColorFilter --> ...Base""

This reverts commit a693a4704ed4dfb06ac56ce915247fa753b24ca7.

Change-Id: I7f3a443ad654b3f7413c99b51d9b20b32361108a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298981
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkColorFilter.cpp

diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index fca7d26..a0800f3 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -103,7 +103,7 @@
                                        skvm::Uniforms* uniforms, SkArenaAlloc* alloc) const {
     skvm::F32 original = c.a;
     if ((c = this->onProgram(p,c, dstCS, uniforms,alloc))) {
-        if (this->getFlags() & kAlphaUnchanged_Flag) {
+        if (this->isAlphaUnchanged()) {
             c.a = original;
         }
         return c;

src/core/SkColorFilter_Matrix.cpp

diff --git a/src/core/SkColorFilter_Matrix.cpp b/src/core/SkColorFilter_Matrix.cpp
index d16a3e9..0f2f6d8 100644
--- a/src/core/SkColorFilter_Matrix.cpp
+++ b/src/core/SkColorFilter_Matrix.cpp
@@ -26,7 +26,7 @@
         && SkScalarNearlyZero (srcA[2])
         && SkScalarNearlyEqual(srcA[3], 1)
         && SkScalarNearlyZero (srcA[4])
-            ? SkColorFilterBase::kAlphaUnchanged_Flag : 0;
+            ? SkColorFilter::kAlphaUnchanged_Flag : 0;
 }
 
 SkColorFilter_Matrix::SkColorFilter_Matrix(const float array[20], Domain domain)

src/core/SkPaintPriv.cpp

diff --git a/src/core/SkPaintPriv.cpp b/src/core/SkPaintPriv.cpp
index 7ad907b..ee54f0c 100644
--- a/src/core/SkPaintPriv.cpp
+++ b/src/core/SkPaintPriv.cpp
@@ -15,7 +15,7 @@
 
 static bool changes_alpha(const SkPaint& paint) {
     SkColorFilter* cf = paint.getColorFilter();
-    return cf && !(as_CFB(cf)->getFlags() & SkColorFilterBase::kAlphaUnchanged_Flag);
+    return cf && !as_CFB(cf)->isAlphaUnchanged();
 }
 
 bool SkPaintPriv::Overwrites(const SkPaint* paint, ShaderOverrideOpacity overrideOpacity) {

src/core/SkRasterPipelineBlitter.cpp

diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index 4fdcffd..5c66464 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -185,8 +185,7 @@
             colorPipeline, alloc, dst.colorType(), dst.colorSpace(), paint, nullptr, matrixProvider
         };
         as_CFB(colorFilter)->appendStages(rec, is_opaque);
-        is_opaque = is_opaque
-                 && (as_CFB(colorFilter)->getFlags() & SkColorFilterBase::kAlphaUnchanged_Flag);
+        is_opaque = is_opaque && as_CFB(colorFilter)->isAlphaUnchanged();
     }
 
 #if defined(SK_LATE_DITHER)

tests/ImageFilterTest.cpp

diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 3e0ba0e..4684c6b 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -1546,7 +1546,7 @@
         sk_sp<SkColorFilter> greenCF(SkColorFilters::Matrix(greenMatrix));
         sk_sp<SkImageFilter> green(SkImageFilters::ColorFilter(greenCF, nullptr));
 
-        REPORTER_ASSERT(reporter,as_CFB( greenCF)->affectsTransparentBlack());
+        REPORTER_ASSERT(reporter, as_CFB(greenCF)->affectsTransparentBlack());
         REPORTER_ASSERT(reporter, !green->canComputeFastBounds());
 
         sk_sp<SkImageFilter> greenBlur(SkImageFilters::Blur(SK_Scalar1, SK_Scalar1,

tests/SerializationTest.cpp

diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 080e3f9..fd1cbfb 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -302,10 +302,9 @@
     for (int i = 0; i < 256; ++i) {
         table[i] = (i * 41) % 256;
     }
-    auto colorFilter(SkTableColorFilter::Make(table));
+    auto filter = SkTableColorFilter::Make(table);
     sk_sp<SkColorFilter> copy(
-        TestFlattenableSerialization<SkColorFilterBase>((SkColorFilterBase*)colorFilter.get(),
-                                                        true, reporter));
+        TestFlattenableSerialization(as_CFB(filter.get()), true, reporter));
 }
 
 static SkBitmap draw_picture(SkPicture& picture) {