move declaration of CreateLightingFilter into SkColorMatrixFilter

BUG=skia:4791
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1574023002

Review URL: https://codereview.chromium.org/1574023002

2 files changed, 29 insertions, 26 deletions

diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp
index 4515c0d3fe..fe39dd9800 100644
--- a/src/effects/SkColorFilters.cpp
+++ b/src/effects/SkColorFilters.cpp
@@ -14,7 +14,6 @@
 #include "SkUtils.h"
 #include "SkString.h"
 #include "SkValidationUtils.h"
-#include "SkColorMatrixFilter.h"
 
 bool SkModeColorFilter::asColorMode(SkColor* color, SkXfermode::Mode* mode) const {
     if (color) {
@@ -169,28 +168,3 @@ SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color, SkXfermode::Mode m
             return SkModeColorFilter::Create(color, mode);
     }
 }
-
-///////////////////////////////////////////////////////////////////////////////
-
-static SkScalar byte_to_scale(U8CPU byte) {
-    if (0xFF == byte) {
-        // want to get this exact
-        return 1;
-    } else {
-        return byte * 0.00392156862745f;
-    }
-}
-
-SkColorFilter* SkColorFilter::CreateLightingFilter(SkColor mul, SkColor add) {
-    SkColorMatrix matrix;
-    matrix.setScale(byte_to_scale(SkColorGetR(mul)),
-                    byte_to_scale(SkColorGetG(mul)),
-                    byte_to_scale(SkColorGetB(mul)),
-                    1);
-    matrix.postTranslate(SkIntToScalar(SkColorGetR(add)),
-                         SkIntToScalar(SkColorGetG(add)),
-                         SkIntToScalar(SkColorGetB(add)),
-                         0);
-    return SkColorMatrixFilter::Create(matrix);
-}
-
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 3cc6e2c0c0..f24670e4bc 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -338,3 +338,32 @@ void SkColorMatrixFilter::toString(SkString* str) const {
     str->append(")");
 }
 #endif
+
+///////////////////////////////////////////////////////////////////////////////
+
+static SkScalar byte_to_scale(U8CPU byte) {
+    if (0xFF == byte) {
+        // want to get this exact
+        return 1;
+    } else {
+        return byte * 0.00392156862745f;
+    }
+}
+
+SkColorFilter* SkColorMatrixFilter::CreateLightingFilter(SkColor mul, SkColor add) {
+    SkColorMatrix matrix;
+    matrix.setScale(byte_to_scale(SkColorGetR(mul)),
+                    byte_to_scale(SkColorGetG(mul)),
+                    byte_to_scale(SkColorGetB(mul)),
+                    1);
+    matrix.postTranslate(SkIntToScalar(SkColorGetR(add)),
+                         SkIntToScalar(SkColorGetG(add)),
+                         SkIntToScalar(SkColorGetB(add)),
+                         0);
+    return SkColorMatrixFilter::Create(matrix);
+}
+
+// DEPRECTED -- remove this when chrome/android stop calling it
+SkColorFilter* SkColorFilter::CreateLightingFilter(SkColor mul, SkColor add) {
+    return SkColorMatrixFilter::CreateLightingFilter(mul, add);
+}