commit 19d7bd65045e88724ad59a8d7066a9092754c7e4
author Mike Reed <reed@google.com> Mon Feb 19 14:10:57 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 19 19:40:14 2018 +0000
tree c46b06298abfd41ea470ff9fd75681ec4742b3c7
parent 65fce9edc44a18e7dc56035cd1bbbd3acc7a7b30

hide virtual and rename to onMakeComposed

Bug: skia:
Change-Id: Ic18ee2af3273f81ebec9c9031162e808186c0acd
Reviewed-on: https://skia-review.googlesource.com/108300
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

gm/color4f.cpp

diff --git a/gm/color4f.cpp b/gm/color4f.cpp
index b1ec0bf..792f7d5 100644
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -35,14 +35,13 @@
 static sk_sp<SkColorFilter> make_cf1() {
     SkColorMatrix cm;
     cm.setSaturation(0.75f);
-    auto a(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
+    auto a = SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat);
     // CreateComposedFilter will try to concat these two matrices, resulting in a single
     // filter (which is good for speed). For this test, we want to force a real compose of
     // these two, so our inner filter has a scale-up, which disables the optimization of
     // combining the two matrices.
     cm.setScale(1.1f, 0.9f, 1);
-    auto b(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
-    return SkColorFilter::MakeComposeFilter(a, b);
+    return a->makeComposed(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
 }
 
 static sk_sp<SkColorFilter> make_cf2() {

gm/srgb.cpp

diff --git a/gm/srgb.cpp b/gm/srgb.cpp
index f0bff69..21571c5 100644
--- a/gm/srgb.cpp
+++ b/gm/srgb.cpp
@@ -32,11 +32,11 @@
 
     p.setColorFilter(cf1);
     canvas->drawImage(img, 0, 256, &p);
-    p.setColorFilter(SkColorFilter::MakeComposeFilter(cf1, cf0));
+    p.setColorFilter(cf1->makeComposed(cf0));
     canvas->drawImage(img, 256, 256, &p);
 
     p.setColorFilter(cf2);
     canvas->drawImage(img, 0, 512, &p);
-    p.setColorFilter(SkColorFilter::MakeComposeFilter(cf2, cf0));
+    p.setColorFilter(cf2->makeComposed(cf0));
     canvas->drawImage(img, 256, 512, &p);
 }

gm/tablecolorfilter.cpp

diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp
index df6f7d6..8902d59 100644
--- a/gm/tablecolorfilter.cpp
+++ b/gm/tablecolorfilter.cpp
@@ -263,7 +263,7 @@
         for (int y = 0; y < MODES; ++y) {
             canvas->save();
             for (int x = 0; x < MODES; ++x) {
-                paint.setColorFilter(SkColorFilter::MakeComposeFilter(filters[y], filters[x]));
+                paint.setColorFilter(filters[y]->makeComposed(filters[x]));
                 canvas->drawRect(r, paint);
                 canvas->translate(r.width() + spacer, 0);
             }