diff options
| author |  reed <reed@google.com> | 2016-03-22 08:10:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 08:10:17 -0700 |
| commit | 4c9776b046dd5e9e46e2d1ce35154855c8fcb381 (patch) | |
| tree | 3cdcc394a99b0483921eb86a8f5cc118f20d6433 /src/core/SkColorMatrixFilterRowMajor255.h | |
| parent | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (diff) | |
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=
Review URL: https://codereview.chromium.org/1825073002
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; |