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/bigtileimagefilter.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/bigtileimagefilter.cpp')
| -rw-r--r-- | gm/bigtileimagefilter.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/gm/bigtileimagefilter.cpp b/gm/bigtileimagefilter.cpp index 7d3d3afeed..5c12f94ea0 100644 --- a/gm/bigtileimagefilter.cpp +++ b/gm/bigtileimagefilter.cpp @@ -54,13 +54,15 @@ protected: { SkPaint p; - SkRect bound = SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight)); - sk_sp<SkImageFilter> imageSource(SkImageSource::Create(fRedImage.get())); - SkAutoTUnref<SkImageFilter> tif(SkTileImageFilter::Create( - SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)), - SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight)), - imageSource.get())); - p.setImageFilter(tif); + const SkRect bound = SkRect::MakeIWH(kWidth, kHeight); + sk_sp<SkImageFilter> imageSource(SkImageSource::Make(fRedImage)); + + sk_sp<SkImageFilter> tif(SkTileImageFilter::Create( + SkRect::MakeIWH(kBitmapSize, kBitmapSize), + SkRect::MakeIWH(kWidth, kHeight), + imageSource.get())); + + p.setImageFilter(std::move(tif)); canvas->saveLayer(&bound, &p); canvas->restore(); @@ -69,13 +71,14 @@ protected: { SkPaint p2; - SkRect bound2 = SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)); + const SkRect bound2 = SkRect::MakeIWH(kBitmapSize, kBitmapSize); + + sk_sp<SkImageFilter> tif(SkTileImageFilter::Create( + SkRect::MakeIWH(kBitmapSize, kBitmapSize), + SkRect::MakeIWH(kBitmapSize, kBitmapSize), + nullptr)); - SkAutoTUnref<SkImageFilter> tif2(SkTileImageFilter::Create( - SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)), - SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)), - nullptr)); - p2.setImageFilter(tif2); + p2.setImageFilter(std::move(tif)); canvas->translate(320, 320); canvas->saveLayer(&bound2, &p2); |