update callsites for Make image factories

gm/imagefilterscropexpand.cpp

 /*
  * Copyright 2014 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 "SkColorFilter.h"
@@ skipping 28 matching lines @@
 
     SkISize onISize() override { return SkISize::Make(730, 650); }
 
     void onDraw(SkCanvas* canvas) override {
         SkAutoTUnref<SkColorFilter> cf(
             SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
         SkImageFilter::CropRect cropRect(
             SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)),
             SkImageFilter::CropRect::kHasAll_CropEdge);
 
-        SkAutoTUnref<SkImage> gradientCircle(MakeGradientCircle(64, 64));
+        sk_sp<SkImage> gradientCircle(MakeGradientCircle(64, 64));
         SkBitmap checkerboard;
         MakeCheckerboard(&checkerboard);
 
         SkAutoTUnref<SkImageFilter> gradientCircleSource(
-            SkImageSource::Create(gradientCircle));
+            SkImageSource::Create(gradientCircle.get()));
         SkAutoTUnref<SkImageFilter> noopCropped(
             SkOffsetImageFilter::Create(0, 0, nullptr, &cropRect));
         SkScalar sk255 = SkIntToScalar(255);
         SkScalar matrix[20] = { 1, 0, 0, 0, 0,
                                 0, 1, 0, 0, sk255,
                                 0, 0, 1, 0, 0,
                                 0, 0, 0, 0, sk255 };
         SkAutoTUnref<SkColorFilter> cfAlphaTrans(SkColorMatrixFilter::Create(matrix));
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
@@ skipping 69 matching lines @@
                 canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
                 canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint);
                 canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint);
                 canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint);
                 canvas.drawRect(SkRect::MakeXYWH(8, 8, 8, 8), darkPaint);
                 canvas.restore();
             }
         }
     }
 
-    static SkImage* MakeGradientCircle(int width, int height) {
+    static sk_sp<SkImage> MakeGradientCircle(int width, int height) {
         SkScalar x = SkIntToScalar(width / 2);
         SkScalar y = SkIntToScalar(height / 2);
         SkScalar radius = SkMinScalar(x, y) * 0.8f;
         SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(width, height));
         SkCanvas* canvas = surface->getCanvas();
         canvas->clear(0x00000000);
         SkColor colors[2];
         colors[0] = SK_ColorWHITE;
         colors[1] = SK_ColorBLACK;
         SkPaint paint;
         paint.setShader(SkGradientShader::MakeRadial(SkPoint::Make(x, y), radius, colors, nullptr,
                                                      2, SkShader::kClamp_TileMode));
         canvas->drawCircle(x, y, radius, paint);
 
-        return surface->newImageSnapshot();
+        return surface->makeImageSnapshot();
     }
 
     static void Draw(SkCanvas* canvas, const SkBitmap& bitmap, const SkRect& rect, SkImageFilter* filter) {
         SkPaint paint;
         paint.setImageFilter(filter)->unref();
         canvas->saveLayer(&rect, &paint);
         canvas->drawBitmap(bitmap, 0, 0);
         canvas->restore();
 
         SkPaint strokePaint;
         strokePaint.setColor(0xFFFF0000);
         strokePaint.setStyle(SkPaint::kStroke_Style);
         canvas->drawRect(rect, strokePaint);
 
         canvas->translate(SkIntToScalar(80), 0);
     }
 
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new ImageFiltersCropExpandGM; )