update callsites for Make image factories

gm/image_pict.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 "SkCanvas.h"
 #include "SkImage.h"
@@ skipping 18 matching lines @@
     paint.setColor(SK_ColorBLUE);
     canvas->drawOval(bounds, paint);
 }
 
 /*
  *  Exercise drawing pictures inside an image, showing that the image version is pixelated
  *  (correctly) when it is inside an image.
  */
 class ImagePictGM : public skiagm::GM {
     SkAutoTUnref<SkPicture> fPicture;
-    SkAutoTUnref<SkImage>   fImage0;
-    SkAutoTUnref<SkImage>   fImage1;
+    sk_sp<SkImage>   fImage0;
+    sk_sp<SkImage>   fImage1;
 public:
     ImagePictGM() {}
 
 protected:
     SkString onShortName() override {
         return SkString("image-picture");
     }
 
     SkISize onISize() override {
         return SkISize::Make(850, 450);
     }
 
     void onOnceBeforeDraw() override {
         const SkRect bounds = SkRect::MakeXYWH(100, 100, 100, 100);
         SkPictureRecorder recorder;
         draw_something(recorder.beginRecording(bounds), bounds);
         fPicture.reset(recorder.endRecording());
 
         // extract enough just for the oval.
         const SkISize size = SkISize::Make(100, 100);
 
         SkMatrix matrix;
         matrix.setTranslate(-100, -100);
-        fImage0.reset(SkImage::NewFromPicture(fPicture, size, &matrix, nullptr));
+        fImage0 = SkImage::MakeFromPicture(sk_ref_sp(fPicture.get()), size, &matrix, nullptr);
         matrix.postTranslate(-50, -50);
         matrix.postRotate(45);
         matrix.postTranslate(50, 50);
-        fImage1.reset(SkImage::NewFromPicture(fPicture, size, &matrix, nullptr));
+        fImage1 = SkImage::MakeFromPicture(sk_ref_sp(fPicture.get()), size, &matrix, nullptr);
     }
 
     void drawSet(SkCanvas* canvas) const {
         SkMatrix matrix = SkMatrix::MakeTrans(-100, -100);
         canvas->drawPicture(fPicture, &matrix, nullptr);
-        canvas->drawImage(fImage0, 150, 0);
-        canvas->drawImage(fImage1, 300, 0);
+        canvas->drawImage(fImage0.get(), 150, 0);
+        canvas->drawImage(fImage1.get(), 300, 0);
     }
 
     void onDraw(SkCanvas* canvas) override {
         canvas->translate(20, 20);
 
         this->drawSet(canvas);
 
         canvas->save();
         canvas->translate(0, 130);
         canvas->scale(0.25f, 0.25f);
@@ skipping 123 matching lines @@
 public:
     TextureGenerator(GrContext* ctx, const SkImageInfo& info, SkPicture* pic)
         : SkImageGenerator(info)
         , fCtx(SkRef(ctx))
     {
         SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo,
                                                                    info, 0));
         surface->getCanvas()->clear(0);
         surface->getCanvas()->translate(-100, -100);
         surface->getCanvas()->drawPicture(pic);
-        SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
+        sk_sp<SkImage> image(surface->makeImageSnapshot());
         fTexture.reset(SkRef(as_IB(image)->peekTexture()));
     }
 protected:
     GrTexture* onGenerateTexture(GrContext* ctx, const SkIRect* subset) override {
         if (ctx) {
             SkASSERT(ctx == fCtx.get());
         }
 
         if (!subset) {
             return SkRef(fTexture.get());
@@ skipping 140 matching lines @@
 };
 DEF_GM( return new ImageCacheratorGM("picture", make_pic_generator); )
 DEF_GM( return new ImageCacheratorGM("raster", make_ras_generator); )
 DEF_GM( return new ImageCacheratorGM("ctable", make_ctable_generator); )
 #if SK_SUPPORT_GPU
     DEF_GM( return new ImageCacheratorGM("texture", make_tex_generator); )
 #endif