update callsites for Make image factories

gm/verylargebitmap.cpp

 /*
  * Copyright 2012 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 "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkPictureRecorder.h"
 #include "SkSurface.h"
 
 static void draw(SkCanvas* canvas, int width, int height, SkColor colors[2]) {
     const SkPoint center = { SkIntToScalar(width)/2, SkIntToScalar(height)/2 };
     const SkScalar radius = 40;
     SkPaint paint;
     paint.setShader(SkGradientShader::MakeRadial(center, radius, colors, nullptr, 2,
                                                  SkShader::kMirror_TileMode));
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     canvas->drawPaint(paint);
 }
 
-static SkImage* make_raster_image(int width, int height, SkColor colors[2]) {
+static sk_sp<SkImage> make_raster_image(int width, int height, SkColor colors[2]) {
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(width, height));
     draw(surface->getCanvas(), width, height, colors);
-    return surface->newImageSnapshot();
+    return surface->makeImageSnapshot();
 }
 
-static SkImage* make_picture_image(int width, int height, SkColor colors[2]) {
+static sk_sp<SkImage> make_picture_image(int width, int height, SkColor colors[2]) {
     SkPictureRecorder recorder;
     draw(recorder.beginRecording(SkRect::MakeIWH(width, height)), width, height, colors);
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-    return SkImage::NewFromPicture(picture, SkISize::Make(width, height),
-                                   nullptr, nullptr);
+    return SkImage::MakeFromPicture(sk_ref_sp(picture.get()), SkISize::Make(width, height),
+                                    nullptr, nullptr);
 }
 
-typedef SkImage* (*ImageMakerProc)(int width, int height, SkColor colors[2]);
+typedef sk_sp<SkImage> (*ImageMakerProc)(int width, int height, SkColor colors[2]);
 
 static void show_image(SkCanvas* canvas, int width, int height, SkColor colors[2],
                        ImageMakerProc proc) {
-    SkAutoTUnref<SkImage> image(proc(width, height, colors));
+    sk_sp<SkImage> image(proc(width, height, colors));
 
     SkPaint paint;
     SkRect r;
     SkIRect ir;
 
     paint.setStyle(SkPaint::kStroke_Style);
 
     ir.set(0, 0, 128, 128);
     r.set(ir);
 
@@ skipping 61 matching lines @@
         // since it has a 64K limit on x,y coordinates... (but gpu should succeed)
         show_image(canvas, veryBig, small, colors, fProc);
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 DEF_GM( return new VeryLargeBitmapGM(make_raster_image, "bitmap"); )
 DEF_GM( return new VeryLargeBitmapGM(make_picture_image, "_picture_image"); )