From 47db5fe4436c924f42b05bc63f8fad833b99bfbe Mon Sep 17 00:00:00 2001 From: robertphillips Date: Fri, 15 Apr 2016 05:09:32 -0700 Subject: Revert of Update DisplacementMapEffect to sk_sp (patchset #3 id:40001 of https://codereview.chromium.org/1877783003/ ) Reason for revert: unexpected image diffs in imagefilterscropexpand GM Original issue's description: > Update DisplacementMapEffect to sk_sp > > TBR=reed@google.com > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1877783003 > > Committed: https://skia.googlesource.com/skia/+/a53011ef44705a091a8e24f7ea289a3f9ad759f2 TBR=fmalita@chromium.org,reed@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1884253004 --- bench/ImageFilterDAGBench.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'bench/ImageFilterDAGBench.cpp') diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index 776ee787fd..308b3b0037 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -62,11 +62,10 @@ protected: auto xSelector = SkDisplacementMapEffect::kR_ChannelSelectorType; auto ySelector = SkDisplacementMapEffect::kB_ChannelSelectorType; SkScalar scale = 2; - + sk_sp displ(SkDisplacementMapEffect::Create(xSelector, ySelector, scale, + blur.get(), blur.get())); SkPaint paint; - paint.setImageFilter(SkDisplacementMapEffect::Make(xSelector, ySelector, scale, - blur, blur)); - + paint.setImageFilter(std::move(displ)); SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400)); canvas->drawRect(rect, paint); } -- cgit v1.2.3