From 4ba94e26106a4ecab4d3841d702b57487b82334e Mon Sep 17 00:00:00 2001 From: robertphillips Date: Mon, 4 Apr 2016 12:07:47 -0700 Subject: Switch internal testing ImageFilters over to new onFilterImage interface GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1854133002 Review URL: https://codereview.chromium.org/1854133002 --- gm/imagefiltersbase.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gm/imagefiltersbase.cpp') diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index be4325ef1f..e2e92356e0 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -14,6 +14,7 @@ #include "SkBlurImageFilter.h" #include "SkColorFilterImageFilter.h" #include "SkDropShadowImageFilter.h" +#include "SkSpecialImage.h" #include "SkTestImageFilters.h" class FailImageFilter : public SkImageFilter { @@ -36,9 +37,9 @@ public: protected: FailImageFilter() : INHERITED(nullptr, 0, nullptr) {} - bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const override { - return false; + sk_sp onFilterImage(SkSpecialImage* source, const Context&, + SkIPoint* offset) const override { + return nullptr; } private: @@ -77,11 +78,10 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter) protected: - bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const override { - *result = src; + sk_sp onFilterImage(SkSpecialImage* source, const Context&, + SkIPoint* offset) const override { offset->set(0, 0); - return true; + return sk_ref_sp(source); } private: -- cgit v1.2.3