diff options
| author |  reed <reed@google.com> | 2016-03-17 10:51:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-17 10:51:11 -0700 |
| commit | 9ce9d6772df650ceb0511f275e1a83dffa78ff72 (patch) | |
| tree | 1c0d54a75945863947490ec45cccf7c30eaa2ca4 /gm/bigtileimagefilter.cpp | |
| parent | 42d95a0afb26560586232961445ba36de387ca37 (diff) | |
update callsites for Make image factories
not forced yet, as we still have the build-guard. waiting on chrome CL
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003
TBR=
Review URL: https://codereview.chromium.org/1810813003
Diffstat (limited to 'gm/bigtileimagefilter.cpp')
| -rw-r--r-- | gm/bigtileimagefilter.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gm/bigtileimagefilter.cpp b/gm/bigtileimagefilter.cpp index f2164e8e2f..84b9816a83 100644 --- a/gm/bigtileimagefilter.cpp +++ b/gm/bigtileimagefilter.cpp @@ -10,7 +10,7 @@ #include "SkTileImageFilter.h" #include "gm.h" -static SkImage* create_circle_texture(int size, SkColor color) { +static sk_sp<SkImage> create_circle_texture(int size, SkColor color) { SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(size, size)); SkCanvas* canvas = surface->getCanvas(); canvas->clear(0xFF000000); @@ -22,7 +22,7 @@ static SkImage* create_circle_texture(int size, SkColor color) { canvas->drawCircle(SkScalarHalf(size), SkScalarHalf(size), SkScalarHalf(size), paint); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } namespace skiagm { @@ -44,8 +44,8 @@ protected: } void onOnceBeforeDraw() override { - fRedImage.reset(create_circle_texture(kBitmapSize, SK_ColorRED)); - fGreenImage.reset(create_circle_texture(kBitmapSize, SK_ColorGREEN)); + fRedImage = create_circle_texture(kBitmapSize, SK_ColorRED); + fGreenImage = create_circle_texture(kBitmapSize, SK_ColorGREEN); } void onDraw(SkCanvas* canvas) override { @@ -55,11 +55,11 @@ protected: SkPaint p; SkRect bound = SkRect::MakeWH(SkIntToScalar(kWidth), SkIntToScalar(kHeight)); - SkAutoTUnref<SkImageFilter> imageSource(SkImageSource::Create(fRedImage)); + 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)); + imageSource.get())); p.setImageFilter(tif); canvas->saveLayer(&bound, &p); @@ -84,7 +84,7 @@ protected: SkRect bound3 = SkRect::MakeXYWH(320, 320, SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)); - canvas->drawImageRect(fGreenImage, bound2, bound3, nullptr, + canvas->drawImageRect(fGreenImage.get(), bound2, bound3, nullptr, SkCanvas::kStrict_SrcRectConstraint); canvas->restore(); } @@ -95,8 +95,8 @@ private: static const int kHeight = 512; static const int kBitmapSize = 64; - SkAutoTUnref<SkImage> fRedImage; - SkAutoTUnref<SkImage> fGreenImage; + sk_sp<SkImage> fRedImage; + sk_sp<SkImage> fGreenImage; typedef GM INHERITED; }; |