diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-01 09:28:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-01 09:28:51 -0700 |
| commit | 549c8991959333e5c0f53faebcbbd5d6bc8f6a56 (patch) | |
| tree | db498c61ef16f570f8c43b5c7bf462529134704a /gm/tileimagefilter.cpp | |
| parent | f27002947d40ab884e13d39ee2ef0ac4ccadcd6a (diff) | |
Update SkImageSource to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842243002
Review URL: https://codereview.chromium.org/1842243002
Diffstat (limited to 'gm/tileimagefilter.cpp')
| -rw-r--r-- | gm/tileimagefilter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gm/tileimagefilter.cpp b/gm/tileimagefilter.cpp index e067d3ee04..c0cca3c895 100644 --- a/gm/tileimagefilter.cpp +++ b/gm/tileimagefilter.cpp @@ -56,7 +56,7 @@ protected: int x = 0, y = 0; for (size_t i = 0; i < 4; i++) { - SkImage* image = (i & 0x01) ? fCheckerboard.get() : fBitmap.get(); + sk_sp<SkImage> image = (i & 0x01) ? fCheckerboard : fBitmap; SkRect srcRect = SkRect::MakeXYWH(SkIntToScalar(image->width()/4), SkIntToScalar(image->height()/4), SkIntToScalar(image->width()/(i+1)), @@ -65,13 +65,12 @@ protected: SkIntToScalar(i * 4), SkIntToScalar(image->width() - i * 12), SkIntToScalar(image->height()) - i * 12); - SkAutoTUnref<SkImageFilter> tileInput(SkImageSource::Create(image)); - SkAutoTUnref<SkImageFilter> filter( - SkTileImageFilter::Create(srcRect, dstRect, tileInput)); + sk_sp<SkImageFilter> tileInput(SkImageSource::Make(image)); + sk_sp<SkImageFilter> filter(SkTileImageFilter::Create(srcRect, dstRect, tileInput.get())); canvas->save(); canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); SkPaint paint; - paint.setImageFilter(filter); + paint.setImageFilter(std::move(filter)); canvas->drawImage(fBitmap.get(), 0, 0, &paint); canvas->drawRect(srcRect, red); canvas->drawRect(dstRect, blue); |