Index: include/effects/SkTableColorFilter.h |
diff --git a/include/effects/SkTableColorFilter.h b/include/effects/SkTableColorFilter.h |
index fe31149464dc44170f8a5405559984a33cd05a2d..e4d42dc00cc4cd8a1c7a19f10601763844c24d03 100644 |
--- a/include/effects/SkTableColorFilter.h |
+++ b/include/effects/SkTableColorFilter.h |
@@ -23,7 +23,7 @@ |
* colors are premultiplied, they are temporarily unpremultiplied, then |
* the table is applied, and then the result is remultiplied. |
*/ |
- static sk_sp<SkColorFilter> Make(const uint8_t table[256]); |
+ static SkColorFilter* Create(const uint8_t table[256]); |
/** |
* Create a table colorfilter, with a different table for each |
@@ -31,23 +31,11 @@ |
* 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]) { |
- return MakeARGB(tableA, tableR, tableG, tableB).release(); |
- } |
-#endif |
- |
+ const uint8_t tableB[256]); |
+ |
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() |
}; |