Index: src/core/SkColorMatrixFilterRowMajor255.h |
diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h |
index 106d2bd882a798886824c050526a1ba70f7f0e48..0ad64fa2f0ed8e1a1f1f6c700d1fd173ade04d38 100644 |
--- a/src/core/SkColorMatrixFilterRowMajor255.h |
+++ b/src/core/SkColorMatrixFilterRowMajor255.h |
@@ -12,16 +12,17 @@ |
class SK_API SkColorMatrixFilterRowMajor255 : public SkColorFilter { |
public: |
+ SkColorMatrixFilterRowMajor255() {}; |
explicit SkColorMatrixFilterRowMajor255(const SkScalar array[20]); |
/** Creates a color matrix filter that returns the same value in all four channels. */ |
- static SkColorFilter* CreateSingleChannelOutput(const SkScalar row[5]); |
+ static sk_sp<SkColorFilter> MakeSingleChannelOutput(const SkScalar row[5]); |
void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override; |
void filterSpan4f(const SkPM4f src[], int count, SkPM4f[]) const override; |
uint32_t getFlags() const override; |
bool asColorMatrix(SkScalar matrix[20]) const override; |
- SkColorFilter* newComposed(const SkColorFilter*) const override; |
+ sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter>) const override; |
#if SK_SUPPORT_GPU |
const GrFragmentProcessor* asFragmentProcessor(GrContext*) const override; |
@@ -35,8 +36,6 @@ protected: |
void flatten(SkWriteBuffer&) const override; |
private: |
- SkColorMatrixFilterRowMajor255() {}; |
- |
SkScalar fMatrix[20]; |
float fTranspose[20]; // for Sk4s |
uint32_t fFlags; |