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 /include/effects/SkColorCubeFilter.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 'include/effects/SkColorCubeFilter.h')
| -rw-r--r-- | include/effects/SkColorCubeFilter.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/effects/SkColorCubeFilter.h b/include/effects/SkColorCubeFilter.h index 8d63667c32..8b621292b0 100644 --- a/include/effects/SkColorCubeFilter.h +++ b/include/effects/SkColorCubeFilter.h @@ -20,7 +20,11 @@ public: * This cube contains a transform where (x,y,z) maps to the (r,g,b). * The alpha components of the colors must be 0xFF. */ + static sk_sp<SkColorFilter> Make(sk_sp<SkData> cubeData, int cubeDimension); + +#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR static SkColorFilter* Create(SkData* cubeData, int cubeDimension); +#endif void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override; uint32_t getFlags() const override; @@ -33,7 +37,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorCubeFilter) protected: - SkColorCubeFilter(SkData* cubeData, int cubeDimension); + SkColorCubeFilter(sk_sp<SkData> cubeData, int cubeDimension); void flatten(SkWriteBuffer&) const override; private: |