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 --- gm/imagefilterstransformed.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gm/imagefilterstransformed.cpp') diff --git a/gm/imagefilterstransformed.cpp b/gm/imagefilterstransformed.cpp index ce7ba5d6e0..291d1d46ec 100644 --- a/gm/imagefilterstransformed.cpp +++ b/gm/imagefilterstransformed.cpp @@ -69,11 +69,12 @@ protected: SkBlurImageFilter::Make(12, 0, nullptr), SkDropShadowImageFilter::Make(0, 15, 8, 0, SK_ColorGREEN, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, nullptr), - SkDisplacementMapEffect::Make(SkDisplacementMapEffect::kR_ChannelSelectorType, - SkDisplacementMapEffect::kR_ChannelSelectorType, - 12, - std::move(gradient), - checkerboard), + sk_sp(SkDisplacementMapEffect::Create( + SkDisplacementMapEffect::kR_ChannelSelectorType, + SkDisplacementMapEffect::kR_ChannelSelectorType, + 12, + gradient.get(), + checkerboard.get())), SkDilateImageFilter::Make(2, 2, checkerboard), SkErodeImageFilter::Make(2, 2, checkerboard), }; -- cgit v1.2.3