Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: include/core/SkColorFilter.h

Issue 1820303002: Revert of switch colorfilters to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/skia_for_android_framework_defines.gypi ('k') | include/core/SkPaint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkColorFilter.h
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index 7ac335fb103677fb50037915e67b99b9dbbcf177..4c9795c2711037b646ef876edc01beb0c8cdb037 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -86,7 +86,7 @@
*
* 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 @@
@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 @@
* 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
« no previous file with comments | « gyp/skia_for_android_framework_defines.gypi ('k') | include/core/SkPaint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698