diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-15 05:09:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-15 05:09:32 -0700 |
| commit | 47db5fe4436c924f42b05bc63f8fad833b99bfbe (patch) | |
| tree | ee36eee27a6b983aec2a6600a2a50768ec9e4fc0 /gm/imagefiltersscaled.cpp | |
| parent | ad3dc0da218cc43c9917a256d4afb8cf0d7c5899 (diff) | |
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
Diffstat (limited to 'gm/imagefiltersscaled.cpp')
| -rw-r--r-- | gm/imagefiltersscaled.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index 756b7c624c..4c48aec869 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -98,11 +98,12 @@ protected: SkIntToScalar(3), SkIntToScalar(3), SK_ColorYELLOW, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, nullptr), - SkDisplacementMapEffect::Make(SkDisplacementMapEffect::kR_ChannelSelectorType, - SkDisplacementMapEffect::kR_ChannelSelectorType, - SkIntToScalar(12), - std::move(gradient), - checkerboard), + sk_sp<SkImageFilter>(SkDisplacementMapEffect::Create( + SkDisplacementMapEffect::kR_ChannelSelectorType, + SkDisplacementMapEffect::kR_ChannelSelectorType, + SkIntToScalar(12), + gradient.get(), + checkerboard.get())), SkDilateImageFilter::Make(1, 1, checkerboard), SkErodeImageFilter::Make(1, 1, checkerboard), SkOffsetImageFilter::Make(SkIntToScalar(32), 0, nullptr), |