diff options
author | reed <reed@google.com> | 2016-03-22 07:35:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 07:35:17 -0700 |
commit | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (patch) | |
tree | 58a5fd565f06a398192be170009fefa2a12a1ee2 /include/effects/SkTableColorFilter.h | |
parent | ee451cf09de31267c93b64e1fdac7c823cee7e85 (diff) |
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
Reason for revert:
need to fix unguarded makeWithFilter
Original issue's description:
> switch colorfilters to sk_sp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
>
> Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1820303002
Diffstat (limited to 'include/effects/SkTableColorFilter.h')
-rw-r--r-- | include/effects/SkTableColorFilter.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/include/effects/SkTableColorFilter.h b/include/effects/SkTableColorFilter.h index fe31149464..e4d42dc00c 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 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 @@ 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]) { - return MakeARGB(tableA, tableR, tableG, tableB).release(); - } -#endif - + const uint8_t tableB[256]); + SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() }; |