diff options
author | 2016-03-22 08:59:19 -0700 | |
---|---|---|
committer | 2016-03-22 08:59:19 -0700 | |
commit | d6889293dd0942f27f9593f679722c956831f2c4 (patch) | |
tree | e7c4f9aa9ee2c4e318e8e5c8d69f6918fba1e865 /include/core/SkColorFilter.h | |
parent | 1088db92348baa013511a49392178fccf03e8008 (diff) |
Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ )
Reason for revert:
CreateModeFilter not compiling
Original issue's description:
> 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=
>
> Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381
TBR=
# 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/1821103004
Diffstat (limited to 'include/core/SkColorFilter.h')
-rw-r--r-- | include/core/SkColorFilter.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index 7ac335fb10..4c9795c271 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -86,7 +86,7 @@ public: * * e.g. result(color) == this_filter(inner(color)) */ - virtual sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter>) const { return nullptr; } + virtual SkColorFilter* newComposed(const SkColorFilter* /*inner*/) const { return NULL; } /** * Apply this colorfilter to the specified SkColor. This routine handles @@ -110,7 +110,7 @@ public: @return colorfilter object that applies the src color and mode, or NULL if the mode will have no effect. */ - static sk_sp<SkColorFilter> MakeModeFilter(SkColor c, SkXfermode::Mode mode); + static SkColorFilter* CreateModeFilter(SkColor c, SkXfermode::Mode mode); /** Construct a colorfilter whose effect is to first apply the inner filter and then apply * the outer filter to the result of the inner's. @@ -119,28 +119,12 @@ public: * Due to internal limits, it is possible that this will return NULL, so the caller must * always check. */ - static sk_sp<SkColorFilter> MakeComposeFilter(sk_sp<SkColorFilter> outer, - sk_sp<SkColorFilter> inner); + static SkColorFilter* CreateComposeFilter(SkColorFilter* outer, SkColorFilter* inner); /** Construct a color filter that transforms a color by a 4x5 matrix. The matrix is in row- * major order and the translation column is specified in unnormalized, 0...255, space. */ - static sk_sp<SkColorFilter> MakeMatrixFilterRowMajor255(const SkScalar array[20]); - -#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR - static SkColorFilter* CreateModeFilter(SkColor c, SkXfermode::Mode mode) { - return MakeModeFilter(c, mode).release(); - } - static SkColorFilter* CreateComposeFilter(SkColorFilter* outer, SkColorFilter* inner) { - return MakeComposeFilter(sk_ref_sp(outer), sk_ref_sp(inner)).release(); - } - static SkColorFilter* CreateMatrixFilterRowMajor255(const SkScalar array[20]) { - return MakeMatrixFilterRowMajor255(array).release(); - } - virtual SkColorFilter* newComposed(const SkColorFilter* inner) const { - return this->makeComposed(sk_ref_sp(const_cast<SkColorFilter*>(inner))).release(); - } -#endif + static SkColorFilter* CreateMatrixFilterRowMajor255(const SkScalar array[20]); /** * A subclass may implement this factory function to work with the GPU backend. It returns |