diff options
author | reed <reed@google.com> | 2016-03-22 07:23:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 07:23:24 -0700 |
commit | f809d7687a4fb7b88b651b046da2bc0035d6aa09 (patch) | |
tree | 38fa4182df2c735459e43b0eaaa073c1ef8c612d /src/core/SkColorMatrixFilterRowMajor255.h | |
parent | cfcd1819d1431bbe5812c174fc337d3678d63f06 (diff) |
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
Review URL: https://codereview.chromium.org/1822623002
Diffstat (limited to 'src/core/SkColorMatrixFilterRowMajor255.h')
-rw-r--r-- | src/core/SkColorMatrixFilterRowMajor255.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h index 106d2bd882..0ad64fa2f0 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; |