update callsites for Make image factories

gm/imagescalealigned.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 "SkImage.h"
 #include "SkSurface.h"
 #include "SkTArray.h"
 
 class ImageScaleAlignedGM : public skiagm::GM {
 protected:
     void onOnceBeforeDraw() override {
         const SkVector vectors[] = { { 1, 0 }, { 0, 1 } };
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(vectors); ++i) {
            auto& set = fSets.push_back();
 
            set.fVector = vectors[i];
-           set.fImages.push_back().reset(MakeImage(vectors[i], SK_ColorGREEN));
+           set.fImages.push_back() = MakeImage(vectors[i], SK_ColorGREEN);
            set.fScales.push_back() = 1;
-           set.fImages.push_back().reset(MakeImage(vectors[i], SK_ColorRED));
+           set.fImages.push_back() = MakeImage(vectors[i], SK_ColorRED);
            set.fScales.push_back() = kStretchFactor;
-           set.fImages.push_back().reset(MakeImage(vectors[i], SK_ColorGREEN));
+           set.fImages.push_back() = MakeImage(vectors[i], SK_ColorGREEN);
            set.fScales.push_back() = 1;
         }
     }
 
     SkString onShortName() override {
         return SkString("image_scale_aligned");
     }
 
     SkISize onISize() override {
         return SkISize::Make(580, 780);
@@ skipping 18 matching lines @@
         for (size_t i = 0; i < SK_ARRAY_COUNT(cfgs); ++i) {
             SkAutoCanvasRestore acr(canvas, true);
             canvas->translate(cfgs[i].offset.x(), cfgs[i].offset.y());
             canvas->scale(cfgs[i].scale.x(), cfgs[i].scale.y());
             drawSets(canvas);
         }
     }
 
 private:
     struct ImageSet {
-        SkSTArray<3, SkAutoTUnref<SkImage>, true> fImages;
-        SkSTArray<3, SkScalar>                    fScales;
-        SkVector                                  fVector;
+        SkSTArray<3, sk_sp<SkImage>, true>  fImages;
+        SkSTArray<3, SkScalar>              fScales;
+        SkVector                            fVector;
     };
 
-    static SkImage* MakeImage(const SkVector& vec, SkColor color) {
+    static sk_sp<SkImage> MakeImage(const SkVector& vec, SkColor color) {
         const SkPoint start = SkPoint::Make(vec.y() * kSegLen / 2, vec.x() * kSegLen / 2);
         const SkPoint end   = SkPoint::Make(start.x() + vec.x() * (kSegLen - 1),
                                             start.y() + vec.y() * (kSegLen - 1));
 
         SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(kSegLen, kSegLen));
         surface->getCanvas()->clear(SK_ColorTRANSPARENT);
 
         SkPaint paint;
         paint.setAntiAlias(true);
         const SkRect border = SkRect::MakeIWH(kSegLen, kSegLen).makeInset(.5f, .5f);
         paint.setColor(SK_ColorBLUE);
         paint.setStyle(SkPaint::kStroke_Style);
         surface->getCanvas()->drawRect(border, paint);
 
         paint.setColor(SK_ColorBLACK);
         surface->getCanvas()->drawLine(start.x(), start.y(), end.x(), end.y(), paint);
         surface->getCanvas()->drawPoint(start.x(), start.y(), color);
         surface->getCanvas()->drawPoint(end.x(), end.y(), color);
 
-        return surface->newImageSnapshot();
+        return surface->makeImageSnapshot();
     }
 
     void drawSets(SkCanvas* canvas) const {
         SkAutoCanvasRestore acr(canvas, true);
 
         const SkFilterQuality filters[] = {
             kNone_SkFilterQuality,
             kLow_SkFilterQuality,
             kMedium_SkFilterQuality,
             kHigh_SkFilterQuality
@@ skipping 22 matching lines @@
         SkASSERT(set.fImages.count() == set.fScales.count());
 
         SkPoint pt = SkPoint::Make(0, 0);
         for (int i = 0; i < set.fImages.count(); ++i) {
             auto& img = set.fImages[i];
             const SkRect dst =
                 SkRect::MakeXYWH(pt.x(), pt.y(),
                     img->width() * (1 + (set.fScales[i] - 1) * set.fVector.x()),
                     img->height() * (1 + (set.fScales[i] - 1) * set.fVector.y()));
 
-            canvas->drawImageRect(img, dst, &paint);
+            canvas->drawImageRect(img.get(), dst, &paint);
             pt.offset(dst.width() * set.fVector.x(), dst.height() * set.fVector.y());
         }
 
         return pt;
     }
 
     static const unsigned  kSegLen = 15;
     static const unsigned  kStretchFactor = 4;
     SkSTArray<2, ImageSet> fSets;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new ImageScaleAlignedGM();)