commit 50d79af7b78355fa968143644a01ff2e9ba2a3d7
author Mike Reed <reed@google.com> Sun Apr 21 22:17:03 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 22 19:10:04 2019 +0000
tree 437c96e572194278b0506e4ac8d9f6423fc817ee
parent 731ba99a8581cb81978e8217d210309880558b09

hide internals of SkColorMatrix (so we can migrate to col-major)

Change-Id: If0eb6fb2efb6816b92ad7ca7d8caaace71397b7f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209409
Commit-Queue: Ravi Mistry <rmistry@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

gm/color4f.cpp

diff --git a/gm/color4f.cpp b/gm/color4f.cpp
index e9f3680..1d55618 100644
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -29,19 +29,19 @@
 static sk_sp<SkColorFilter> make_cf0() {
     SkColorMatrix cm;
     cm.setSaturation(0.75f);
-    return SkColorFilters::MatrixRowMajor255(cm.fMat);
+    return SkColorFilters::Matrix(cm);
 }
 
 static sk_sp<SkColorFilter> make_cf1() {
     SkColorMatrix cm;
     cm.setSaturation(0.75f);
-    auto a = SkColorFilters::MatrixRowMajor255(cm.fMat);
+    auto a = SkColorFilters::Matrix(cm);
     // 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);
-    return a->makeComposed(SkColorFilters::MatrixRowMajor255(cm.fMat));
+    return a->makeComposed(SkColorFilters::Matrix(cm));
 }
 
 static sk_sp<SkColorFilter> make_cf2() {

gm/colorfilterimagefilter.cpp

diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp
index 9cc2ccd..dca6486 100644
--- a/gm/colorfilterimagefilter.cpp
+++ b/gm/colorfilterimagefilter.cpp
@@ -178,7 +178,7 @@
     SkAutoCanvasRestore autoCanvasRestore(canvas, false);
     SkColorMatrix cm;
     cm.setSaturation(0.0f);
-    sk_sp<SkColorFilter> cf(SkColorFilters::MatrixRowMajor255(cm.fMat));
+    sk_sp<SkColorFilter> cf(SkColorFilters::Matrix(cm));
     SkPaint p;
     p.setImageFilter(SkColorFilterImageFilter::Make(std::move(cf), nullptr));
     canvas->saveLayer(nullptr, &p);

gm/colormatrix.cpp

diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp
index 41b2da6..0fafdfe 100644
--- a/gm/colormatrix.cpp
+++ b/gm/colormatrix.cpp
@@ -14,7 +14,7 @@
 #define HEIGHT 500
 
 static void set_color_matrix(SkPaint* paint, const SkColorMatrix& matrix) {
-    paint->setColorFilter(SkColorFilters::MatrixRowMajor255(matrix.fMat));
+    paint->setColorFilter(SkColorFilters::Matrix(matrix));
 }
 
 static void set_array(SkPaint* paint, const SkScalar array[]) {

gm/compositor_quads.cpp

diff --git a/gm/compositor_quads.cpp b/gm/compositor_quads.cpp
index ce4bc23..3cd0cad 100644
--- a/gm/compositor_quads.cpp
+++ b/gm/compositor_quads.cpp
@@ -1006,7 +1006,7 @@
 
     SkColorMatrix cm;
     cm.setSaturation(10);
-    sk_sp<SkColorFilter> colorFilter = SkColorFilters::MatrixRowMajor255(cm.fMat);
+    sk_sp<SkColorFilter> colorFilter = SkColorFilters::Matrix(cm);
     sk_sp<SkImageFilter> imageFilter = SkDilateImageFilter::Make(8, 8, nullptr);
 
     static constexpr SkColor kAlphas[] = { SK_ColorTRANSPARENT, SK_ColorBLACK };

gm/imagefilters.cpp

diff --git a/gm/imagefilters.cpp b/gm/imagefilters.cpp
index 5065d13..db11c18 100644
--- a/gm/imagefilters.cpp
+++ b/gm/imagefilters.cpp
@@ -138,7 +138,7 @@
 DEF_SIMPLE_GM(savelayer_with_backdrop, canvas, 830, 550) {
     SkColorMatrix cm;
     cm.setSaturation(10);
-    sk_sp<SkColorFilter> cf(SkColorFilters::MatrixRowMajor255(cm.fMat));
+    sk_sp<SkColorFilter> cf(SkColorFilters::Matrix(cm));
     const SkScalar kernel[] = { 4, 0, 4, 0, -15, 0, 4, 0, 4 };
     sk_sp<SkImageFilter> filters[] = {
         SkBlurImageFilter::Make(10, 10, nullptr),