update callsites for Make image factories

gm/perspshaders.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkGradientShader.h"
 #include "SkImage.h"
 #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) {
         surface.reset(SkSurface::NewRaster(info));
     }
     SkCanvas* canvas = surface->getCanvas();
 
     sk_tool_utils::draw_checkerboard(canvas, SK_ColorRED, SK_ColorGREEN, w/10);
-    return surface->newImageSnapshot();
+    return surface->makeImageSnapshot();
 }
 
 namespace skiagm {
 
 class PerspShadersGM : public GM {
 public:
     PerspShadersGM(bool doAA) : fDoAA(doAA) { }
 
 protected:
     SkString onShortName() override {
@@ skipping 65 matching lines @@
         canvas->save();
 
         canvas->save();
         canvas->concat(fPerspMatrix);
         canvas->drawBitmapRect(fBitmap, r, &filterPaint);
         canvas->restore();
 
         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);
         canvas->save();
         canvas->concat(fPerspMatrix);
         canvas->drawRect(r, pathPaint);
         canvas->restore();
 
         canvas->translate(SkIntToScalar(kCellSize), 0);
         canvas->save();
@@ skipping 11 matching lines @@
         canvas->save();
         canvas->concat(fPerspMatrix);
         canvas->drawPath(fPath, gradPaint2);
         canvas->restore();
 
         canvas->restore();
     }
 
     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);
         canvas->translate(0, SkIntToScalar(kCellSize));
         this->drawRow(canvas, kLow_SkFilterQuality);
         canvas->translate(0, SkIntToScalar(kCellSize));
         this->drawRow(canvas, kMedium_SkFilterQuality);
         canvas->translate(0, SkIntToScalar(kCellSize));
         this->drawRow(canvas, kHigh_SkFilterQuality);
         canvas->translate(0, SkIntToScalar(kCellSize));
     }
 private:
     static const int kCellSize = 50;
     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;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new PerspShadersGM(true);)
 DEF_GM(return new PerspShadersGM(false);)
 }