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/drawminibitmaprect.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/drawminibitmaprect.cpp')
-rw-r--r-- | gm/drawminibitmaprect.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/drawminibitmaprect.cpp b/gm/drawminibitmaprect.cpp index f0ce1a2db6..c494605daf 100644 --- a/gm/drawminibitmaprect.cpp +++ b/gm/drawminibitmaprect.cpp @@ -13,7 +13,7 @@ #include "SkShader.h" #include "SkSurface.h" -static SkImage* makebm(SkCanvas* caller, int w, int h) { +static sk_sp<SkImage> makebm(SkCanvas* caller, int w, int h) { SkImageInfo info = SkImageInfo::MakeN32Premul(w, h); SkAutoTUnref<SkSurface> surface(caller->newSurface(info)); if (nullptr == surface) { @@ -56,7 +56,7 @@ static SkImage* makebm(SkCanvas* caller, int w, int h) { rect.inset(wScalar / 8, hScalar / 8); mat.postScale(SK_Scalar1 / 4, SK_Scalar1 / 4); } - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } static const int gSize = 1024; @@ -80,7 +80,7 @@ protected: void onDraw(SkCanvas* canvas) override { if (nullptr == fImage) { - fImage.reset(makebm(canvas, gSurfaceSize, gSurfaceSize)); + fImage = makebm(canvas, gSurfaceSize, gSurfaceSize); } const SkRect dstRect = { 0, 0, SkIntToScalar(64), SkIntToScalar(64)}; @@ -113,7 +113,7 @@ protected: // rect stays rect break; } - canvas->drawImageRect(fImage, srcRect, dstRect, &paint, + canvas->drawImageRect(fImage.get(), srcRect, dstRect, &paint, SkCanvas::kFast_SrcRectConstraint); canvas->restore(); @@ -131,9 +131,9 @@ protected: } private: - bool fAA; - SkAutoTUnref<SkImage> fImage; - SkString fName; + bool fAA; + sk_sp<SkImage> fImage; + SkString fName; typedef skiagm::GM INHERITED; }; |