diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-08 12:05:37 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-08 12:05:37 -0800 |
| commit | 40736abf74908dfed82567ba88432103c9a7e900 (patch) | |
| tree | 84cf14ba9fdd944aec4746d30fa01aad1d99ad6e /include/effects/SkComposeImageFilter.h | |
| parent | 093779c39add14f0b35b3374fee8f05cff10c9be (diff) | |
Switch SkComposeImageFilter over to new onFilterImage interface
This CL depends on https://codereview.chromium.org/1762013002/ (Swap over to using SkImageFilter::filterImage instead of filterImageDeprecated)
TBR=bsalomon@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1768283002
Review URL: https://codereview.chromium.org/1768283002
Diffstat (limited to 'include/effects/SkComposeImageFilter.h')
| -rw-r--r-- | include/effects/SkComposeImageFilter.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h index 6ad6525fbd..bdef08b5e6 100644 --- a/include/effects/SkComposeImageFilter.h +++ b/include/effects/SkComposeImageFilter.h @@ -12,13 +12,11 @@ class SK_API SkComposeImageFilter : public SkImageFilter { public: - virtual ~SkComposeImageFilter(); - static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) { - if (NULL == outer) { + if (!outer) { return SkSafeRef(inner); } - if (NULL == inner) { + if (!inner) { return SkRef(outer); } SkImageFilter* inputs[2] = { outer, inner }; @@ -34,8 +32,8 @@ protected: SkASSERT(inputs[0]); SkASSERT(inputs[1]); } - bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const override; + SkSpecialImage* onFilterImage(SkSpecialImage* source, const Context&, + SkIPoint* offset) const override; bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*, MapDirection) const override; private: |