update callsites for Make image factories

gm/colormatrix.cpp

 /*
  * Copyright 2011 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 "SkColorMatrixFilter.h"
 #include "SkGradientShader.h"
@@ skipping 19 matching lines @@
 protected:
     SkString onShortName() override {
         return SkString("colormatrix");
     }
 
     SkISize onISize() override {
         return SkISize::Make(WIDTH, HEIGHT);
     }
     
     void onOnceBeforeDraw() override {
-        fSolidImg.reset(CreateSolidBitmap(64, 64));
-        fTransparentImg.reset(CreateTransparentBitmap(64, 64));
+        fSolidImg = CreateSolidBitmap(64, 64);
+        fTransparentImg = CreateTransparentBitmap(64, 64);
     }
 
-    static SkImage* CreateSolidBitmap(int width, int height) {
+    static sk_sp<SkImage> CreateSolidBitmap(int width, int height) {
         SkBitmap bm;
         bm.allocN32Pixels(width, height);
         SkCanvas canvas(bm);
         canvas.clear(0x0);
         for (int y = 0; y < height; ++y) {
             for (int x = 0; x < width; ++x) {
                 SkPaint paint;
                 paint.setColor(SkColorSetARGB(255, x * 255 / width, y * 255 / height, 0));
                 canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(x),
                     SkIntToScalar(y), SK_Scalar1, SK_Scalar1), paint);
             }
         }
-        return SkImage::NewFromBitmap(bm);
+        return SkImage::MakeFromBitmap(bm);
     }
 
     // creates a bitmap with shades of transparent gray.
-    static SkImage* CreateTransparentBitmap(int width, int height) {
+    static sk_sp<SkImage> CreateTransparentBitmap(int width, int height) {
         SkBitmap bm;
         bm.allocN32Pixels(width, height);
         SkCanvas canvas(bm);
         canvas.clear(0x0);
 
         SkPoint pts[] = {{0, 0}, {SkIntToScalar(width), SkIntToScalar(height)}};
         SkColor colors[] = {0x00000000, 0xFFFFFFFF};
         SkPaint paint;
         paint.setShader(SkGradientShader::MakeLinear(pts, colors, nullptr, 2,
                                                      SkShader::kClamp_TileMode));
         canvas.drawRect(SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height)), paint);
-        return SkImage::NewFromBitmap(bm);
+        return SkImage::MakeFromBitmap(bm);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
         SkColorMatrix matrix;
 
         paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-        const SkImage* bmps[] = { fSolidImg, fTransparentImg };
+        const SkImage* bmps[] = { fSolidImg.get(), fTransparentImg.get() };
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(bmps); ++i) {
             matrix.setIdentity();
             set_color_matrix(&paint, matrix);
             canvas->drawImage(bmps[i], 0, 0, &paint);
 
             matrix.setRotate(SkColorMatrix::kR_Axis, 90);
             set_color_matrix(&paint, matrix);
             canvas->drawImage(bmps[i], 80, 0, &paint);
 
@@ skipping 40 matching lines @@
             };
 
             set_array(&paint, data);
             canvas->drawImage(bmps[i], 160, 160, &paint);
             ///////////////////////////////////////////////
             canvas->translate(0, 240);
         }
     }
 
 private:
-    SkAutoTUnref<SkImage>   fSolidImg;
-    SkAutoTUnref<SkImage>   fTransparentImg;
+    sk_sp<SkImage>   fSolidImg;
+    sk_sp<SkImage>   fTransparentImg;
 
     typedef skiagm::GM INHERITED;
 };
 DEF_GM( return new ColorMatrixGM; )