From 9ce9d6772df650ceb0511f275e1a83dffa78ff72 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 17 Mar 2016 10:51:11 -0700 Subject: 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 --- gm/drawbitmaprect.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gm/drawbitmaprect.cpp') diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 7ee2271c5c..8ec7cee28e 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -33,7 +33,7 @@ static SkBitmap make_chessbm(int w, int h) { return bm; } -static SkImage* makebm(SkCanvas* origCanvas, SkBitmap* resultBM, int w, int h) { +static sk_sp makebm(SkCanvas* origCanvas, SkBitmap* resultBM, int w, int h) { SkImageInfo info = SkImageInfo::MakeN32Premul(w, h); SkAutoTUnref surface(origCanvas->newSurface(info)); @@ -81,7 +81,7 @@ static SkImage* makebm(SkCanvas* origCanvas, SkBitmap* resultBM, int w, int h) { mat.postScale(SK_Scalar1 / 4, SK_Scalar1 / 4); } - SkImage* image = surface->newImageSnapshot(); + auto image = surface->makeImageSnapshot(); SkBitmap tempBM; @@ -125,10 +125,10 @@ public: } } - DrawRectRectProc* fProc; - SkBitmap fLargeBitmap; - SkAutoTUnref fImage; - SkString fName; + DrawRectRectProc* fProc; + SkBitmap fLargeBitmap; + sk_sp fImage; + SkString fName; protected: SkString onShortName() override { return fName; } @@ -136,7 +136,7 @@ protected: SkISize onISize() override { return SkISize::Make(gSize, gSize); } void setupImage(SkCanvas* canvas) { - fImage.reset(makebm(canvas, &fLargeBitmap, gBmpSize, gBmpSize)); + fImage = makebm(canvas, &fLargeBitmap, gBmpSize, gBmpSize); } void onDraw(SkCanvas* canvas) override { @@ -172,7 +172,7 @@ protected: for (int h = 1; h <= kMaxSrcRectSize; h *= 4) { SkIRect srcRect = SkIRect::MakeXYWH((gBmpSize - w) / 2, (gBmpSize - h) / 2, w, h); - fProc(canvas, fImage, fLargeBitmap, srcRect, dstRect); + fProc(canvas, fImage.get(), fLargeBitmap, srcRect, dstRect); SkString label; label.appendf("%d x %d", w, h); -- cgit v1.2.3