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 /gm/imagefilterscropped.cpp | |
| 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 'gm/imagefilterscropped.cpp')
| -rw-r--r-- | gm/imagefilterscropped.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp index b06761d80c..612990984a 100644 --- a/gm/imagefilterscropped.cpp +++ b/gm/imagefilterscropped.cpp @@ -122,7 +122,7 @@ protected: SkAutoTUnref<SkImageFilter> offset(SkOffsetImageFilter::Create( SkIntToScalar(-10), SkIntToScalar(-10))); - SkAutoTUnref<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf.get(), offset.get())); + sk_sp<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf.get(), offset.get())); SkAutoTUnref<SkImageFilter> erodeX(SkErodeImageFilter::Create(8, 0, nullptr, &cropRect)); SkAutoTUnref<SkImageFilter> erodeY(SkErodeImageFilter::Create(0, 8, nullptr, &cropRect)); @@ -139,7 +139,8 @@ protected: SkErodeImageFilter::Create(8, 0, erodeY, &cropRect), SkErodeImageFilter::Create(0, 8, erodeX, &cropRect), SkErodeImageFilter::Create(8, 8, nullptr, &cropRect), - SkMergeImageFilter::Create(nullptr, cfOffset.get(), SkXfermode::kSrcOver_Mode, &cropRect), + SkMergeImageFilter::Make(nullptr, std::move(cfOffset), + SkXfermode::kSrcOver_Mode, &cropRect).release(), SkBlurImageFilter::Create(8.0f, 8.0f, nullptr, &bogusRect), SkColorFilterImageFilter::Create(cf.get(), nullptr, &bogusRect), }; |