Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"

Fixed legacy withColorFilter to call new(er) make method

This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f.

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

TBR=

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

1 files changed, 15 insertions, 3 deletions

diff --git a/include/effects/SkTableColorFilter.h b/include/effects/SkTableColorFilter.h
index e4d42dc00c..fe31149464 100644
--- a/include/effects/SkTableColorFilter.h
+++ b/include/effects/SkTableColorFilter.h
@@ -23,7 +23,7 @@ public:
      *  colors are premultiplied, they are temporarily unpremultiplied, then
      *  the table is applied, and then the result is remultiplied.
      */
-    static SkColorFilter* Create(const uint8_t table[256]);
+    static sk_sp<SkColorFilter> Make(const uint8_t table[256]);
 
     /**
      *  Create a table colorfilter, with a different table for each
@@ -31,11 +31,23 @@ public:
      *  treated as identity, with the component left unchanged. If a table
      *  is not null, then its contents are copied into the filter.
      */
+    static sk_sp<SkColorFilter> MakeARGB(const uint8_t tableA[256],
+                                         const uint8_t tableR[256],
+                                         const uint8_t tableG[256],
+                                         const uint8_t tableB[256]);
+
+#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
+    static SkColorFilter* Create(const uint8_t table[256]) {
+        return Make(table).release();
+    }
     static SkColorFilter* CreateARGB(const uint8_t tableA[256],
                                      const uint8_t tableR[256],
                                      const uint8_t tableG[256],
-                                     const uint8_t tableB[256]);
-
+                                     const uint8_t tableB[256]) {
+        return MakeARGB(tableA, tableR, tableG, tableB).release();
+    }
+#endif
+    
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 };