update callsites for Make image factories

gm/imagefilters.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 "SkBlurImageFilter.h"
 #include "SkColorMatrixFilter.h"
@@ skipping 48 matching lines @@
             canvas->save();
             do_draw(canvas, modes[i], nullptr);
             canvas->translate(240, 0);
             do_draw(canvas, modes[i], imf);
             canvas->restore();
 
             canvas->translate(0, 240);
         }
 }
 
-static SkImage* make_image(SkCanvas* canvas) {
+static sk_sp<SkImage> make_image(SkCanvas* canvas) {
     const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
     SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
     if (!surface) {
         surface.reset(SkSurface::NewRaster(info));
     }
     surface->getCanvas()->drawRect(SkRect::MakeXYWH(25, 25, 50, 50), SkPaint());
-    return surface->newImageSnapshot();
+    return surface->makeImageSnapshot();
 }
 
 // Compare blurs when we're tightly clipped (fast) and not as tightly (slower)
 //
 // Expect the two to draw the same (modulo the extra border of pixels when the clip is larger)
 //
 DEF_SIMPLE_GM(fast_slow_blurimagefilter, canvas, 620, 260) {
-    SkAutoTUnref<SkImage> image(make_image(canvas));
+    sk_sp<SkImage> image(make_image(canvas));
     const SkRect r = SkRect::MakeIWH(image->width(), image->height());
 
     canvas->translate(10, 10);
     for (SkScalar sigma = 8; sigma <= 128; sigma *= 2) {
         SkPaint paint;
         SkAutoTUnref<SkImageFilter> blur(SkBlurImageFilter::Create(sigma, sigma));
         paint.setImageFilter(blur);
 
         canvas->save();
         // we outset the clip by 1, to fall out of the fast-case in drawImage
@@ skipping 60 matching lines @@
         SkScalar    fSx, fSy, fTx, fTy;
     } xforms[] = {
         { 1, 1, 0, 0 },
         { 0.5f, 0.5f, 530, 0 },
         { 0.25f, 0.25f, 530, 275 },
         { 0.125f, 0.125f, 530, 420 },
     };
 
     SkPaint paint;
     paint.setFilterQuality(kMedium_SkFilterQuality);
-    SkAutoTUnref<SkImage> image(GetResourceAsImage("mandrill_512.png"));
+    sk_sp<SkImage> image(GetResourceAsImage("mandrill_512.png"));
 
     canvas->translate(20, 20);
     for (const auto& xform : xforms) {
         canvas->save();
         canvas->translate(xform.fTx, xform.fTy);
         canvas->scale(xform.fSx, xform.fSy);
         canvas->drawImage(image, 0, 0, &paint);
         draw_set(canvas, filters, SK_ARRAY_COUNT(filters));
         canvas->restore();
     }
 
     for (auto& filter : filters) {
         filter->unref();
     }
 }