diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-04 08:06:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 08:06:17 -0700 |
| commit | b591c77c3770a3216ce75c8b77f1017c917db1f9 (patch) | |
| tree | b49fbede2c9416e4a58f48e67aec41c8aed71310 /samplecode/SampleFilterFuzz.cpp | |
| parent | 47a2dc8e229e93e1bcf7405747320920da1ab742 (diff) | |
Revert of Update SkXfermodeImageFilter to sk_sp (patchset #4 id:60001 of https://codereview.chromium.org/1852123002/ )
Reason for revert:
Chrome-land compilation failure.
Original issue's description:
> Update SkXfermodeImageFilter to sk_sp
>
> TBR=reed@google.com
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852123002
>
> Committed: https://skia.googlesource.com/skia/+/3bc969264d4720d67f0b137552b3777a03b431a8
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/1852273002
Diffstat (limited to 'samplecode/SampleFilterFuzz.cpp')
| -rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 8d2cef091d..6413aa103f 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -595,12 +595,15 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { case DOWN_SAMPLE: filter = sk_sp<SkImageFilter>(SkDownSampleImageFilter::Create(make_scalar())); break; - case XFERMODE: + case XFERMODE: { + sk_sp<SkImageFilter> subFilter1(make_image_filter()); + sk_sp<SkImageFilter> subFilter2(make_image_filter()); filter = SkXfermodeImageFilter::Make(SkXfermode::Make(make_xfermode()), - make_image_filter(), - make_image_filter(), + subFilter1.get(), + subFilter2.get(), nullptr); break; + } case OFFSET: filter = SkOffsetImageFilter::Make(make_scalar(), make_scalar(), make_image_filter()); break; |