diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-10 04:44:20 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-10 04:44:20 -0800 |
| commit | 393aa36815b7911f2acc5abd274cda1c5da78e1d (patch) | |
| tree | 83057d3fb1f143af7cd3aab649f29ae01b88a857 /include/effects/SkMergeImageFilter.h | |
| parent | 0d996868c3dd5af2ccb6fced488edb335185c107 (diff) | |
Switch SkMergeImageFilter over to new onFilterImage interface
This relies on CL: 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=1763223002
Review URL: https://codereview.chromium.org/1763223002
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
| -rw-r--r-- | include/effects/SkMergeImageFilter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 668e06f6da..082473110b 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -14,7 +14,7 @@ class SK_API SkMergeImageFilter : public SkImageFilter { public: - virtual ~SkMergeImageFilter(); + ~SkMergeImageFilter() override; static SkImageFilter* Create(SkImageFilter* first, SkImageFilter* second, SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode, @@ -35,8 +35,8 @@ public: protected: void flatten(SkWriteBuffer&) const override; - bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, - SkIPoint* loc) const override; + SkSpecialImage* onFilterImage(SkSpecialImage* source, const Context&, + SkIPoint* offset) const override; private: SkMergeImageFilter(SkImageFilter* filters[], int count, const SkXfermode::Mode modes[], |