Index: src/core/SkColorMatrixFilterRowMajor255.cpp |
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp |
index bd9a66a561a50f4744f07480c23d200658a4efc9..09df61699d1e6dedde7ee2d83c623c1002ca405a 100644 |
--- a/src/core/SkColorMatrixFilterRowMajor255.cpp |
+++ b/src/core/SkColorMatrixFilterRowMajor255.cpp |
@@ -226,13 +226,12 @@ |
// End duplication |
////// |
-sk_sp<SkColorFilter> |
-SkColorMatrixFilterRowMajor255::makeComposed(sk_sp<SkColorFilter> innerFilter) const { |
+SkColorFilter* SkColorMatrixFilterRowMajor255::newComposed(const SkColorFilter* innerFilter) const { |
SkScalar innerMatrix[20]; |
if (innerFilter->asColorMatrix(innerMatrix) && !needs_clamping(innerMatrix)) { |
SkScalar concat[20]; |
set_concat(concat, fMatrix, innerMatrix); |
- return sk_make_sp<SkColorMatrixFilterRowMajor255>(concat); |
+ return new SkColorMatrixFilterRowMajor255(concat); |
} |
return nullptr; |
} |
@@ -418,16 +417,15 @@ |
/////////////////////////////////////////////////////////////////////////////// |
-sk_sp<SkColorFilter> SkColorFilter::MakeMatrixFilterRowMajor255(const SkScalar array[20]) { |
- return sk_sp<SkColorFilter>(new SkColorMatrixFilterRowMajor255(array)); |
-} |
- |
-/////////////////////////////////////////////////////////////////////////////// |
- |
-sk_sp<SkColorFilter> |
-SkColorMatrixFilterRowMajor255::MakeSingleChannelOutput(const SkScalar row[5]) { |
+SkColorFilter* SkColorFilter::CreateMatrixFilterRowMajor255(const SkScalar array[20]) { |
+ return new SkColorMatrixFilterRowMajor255(array); |
+} |
+ |
+/////////////////////////////////////////////////////////////////////////////// |
+ |
+SkColorFilter* SkColorMatrixFilterRowMajor255::CreateSingleChannelOutput(const SkScalar row[5]) { |
SkASSERT(row); |
- auto cf = sk_make_sp<SkColorMatrixFilterRowMajor255>(); |
+ SkColorMatrixFilterRowMajor255* cf = new SkColorMatrixFilterRowMajor255(); |
static_assert(sizeof(SkScalar) * 5 * 4 == sizeof(cf->fMatrix), "sizes don't match"); |
for (int i = 0; i < 4; ++i) { |
memcpy(cf->fMatrix + 5 * i, row, sizeof(SkScalar) * 5); |