diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-30 13:34:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-30 13:34:17 -0700 |
| commit | 2238c9dbca4b791edc512957728a18ce14d55912 (patch) | |
| tree | 684102215b697506f7c2dce012bb89183467e208 /samplecode | |
| parent | 3243143f25f4ccba632847574cf8e1a8ee0fe0f2 (diff) | |
Update SkMergeImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847583002
Review URL: https://codereview.chromium.org/1847583002
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 103d8c4a56..a1e8c2df7b 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -559,14 +559,11 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { make_scalar(), make_scalar())); break; - case MERGE: { - sk_sp<SkImageFilter> subFilter1(make_image_filter()); - sk_sp<SkImageFilter> subFilter2(make_image_filter()); - filter = sk_sp<SkImageFilter>(SkMergeImageFilter::Create(subFilter1.get(), - subFilter2.get(), - make_xfermode())); + case MERGE: + filter = SkMergeImageFilter::Make(make_image_filter(), + make_image_filter(), + make_xfermode()); break; - } case COLOR: { sk_sp<SkColorFilter> cf(make_color_filter()); sk_sp<SkImageFilter> subFilter(make_image_filter()); |