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 /samplecode/SampleFilterFuzz.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 'samplecode/SampleFilterFuzz.cpp')
| -rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 12b6a8af99..5f06731ae5 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -709,13 +709,17 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { } break; } - case DISPLACE: - filter = SkDisplacementMapEffect::Make(make_channel_selector_type(), - make_channel_selector_type(), - make_scalar(), - make_image_filter(false), - make_image_filter()); + case DISPLACE: { + sk_sp<SkImageFilter> subFilter1(make_image_filter(false)); + sk_sp<SkImageFilter> subFilter2(make_image_filter()); + + filter = sk_sp<SkImageFilter>(SkDisplacementMapEffect::Create(make_channel_selector_type(), + make_channel_selector_type(), + make_scalar(), + subFilter1.get(), + subFilter2.get())); break; + } case TILE: { sk_sp<SkImageFilter> subFilter(make_image_filter(false)); |