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/perspshaders.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/perspshaders.cpp')
-rw-r--r-- | gm/perspshaders.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gm/perspshaders.cpp b/gm/perspshaders.cpp index a29ef52f46..b2ac3287f2 100644 --- a/gm/perspshaders.cpp +++ b/gm/perspshaders.cpp @@ -11,7 +11,7 @@ #include "SkPath.h" #include "SkSurface.h" -static SkImage* make_image(SkCanvas* origCanvas, int w, int h) { +static sk_sp<SkImage> make_image(SkCanvas* origCanvas, int w, int h) { SkImageInfo info = SkImageInfo::MakeN32Premul(w, h); SkAutoTUnref<SkSurface> surface(origCanvas->newSurface(info)); if (nullptr == surface) { @@ -20,7 +20,7 @@ static SkImage* make_image(SkCanvas* origCanvas, int w, int h) { SkCanvas* canvas = surface->getCanvas(); sk_tool_utils::draw_checkerboard(canvas, SK_ColorRED, SK_ColorGREEN, w/10); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } namespace skiagm { @@ -106,7 +106,7 @@ protected: canvas->translate(SkIntToScalar(kCellSize), 0); canvas->save(); canvas->concat(fPerspMatrix); - canvas->drawImage(fImage, 0, 0, &filterPaint); + canvas->drawImage(fImage.get(), 0, 0, &filterPaint); canvas->restore(); canvas->translate(SkIntToScalar(kCellSize), 0); @@ -138,7 +138,7 @@ protected: void onDraw(SkCanvas* canvas) override { if (!fImage) { - fImage.reset(make_image(canvas, kCellSize, kCellSize)); + fImage = make_image(canvas, kCellSize, kCellSize); } this->drawRow(canvas, kNone_SkFilterQuality); @@ -155,14 +155,14 @@ private: static const int kNumRows = 4; static const int kNumCols = 6; - bool fDoAA; - SkPath fPath; - sk_sp<SkShader> fBitmapShader; - sk_sp<SkShader> fLinearGrad1; - sk_sp<SkShader> fLinearGrad2; - SkMatrix fPerspMatrix; - SkAutoTUnref<SkImage> fImage; - SkBitmap fBitmap; + bool fDoAA; + SkPath fPath; + sk_sp<SkShader> fBitmapShader; + sk_sp<SkShader> fLinearGrad1; + sk_sp<SkShader> fLinearGrad2; + SkMatrix fPerspMatrix; + sk_sp<SkImage> fImage; + SkBitmap fBitmap; typedef GM INHERITED; }; |