update callsites for Make image factories

gm/drawatlascolor.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 "SkRSXform.h"
 #include "SkSurface.h"
 
 // Create a square atlas of:
 //   opaque white  |     opaque red
 //  ------------------------------------
 //   opaque green  |  transparent black
 //
-static SkImage* make_atlas(SkCanvas* caller, int atlasSize) {
+static sk_sp<SkImage> make_atlas(SkCanvas* caller, int atlasSize) {
     const int kBlockSize = atlasSize/2;
 
     SkImageInfo info = SkImageInfo::MakeN32Premul(atlasSize, atlasSize);
     SkAutoTUnref<SkSurface> surface(caller->newSurface(info));
     if (nullptr == surface) {
         surface.reset(SkSurface::NewRaster(info));
     }
     SkCanvas* canvas = surface->getCanvas();
 
     SkPaint paint;
@@ skipping 12 matching lines @@
     paint.setColor(SK_ColorGREEN);
     r = SkRect::MakeXYWH(0, SkIntToScalar(kBlockSize), 
                          SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
     canvas->drawRect(r, paint);
 
     paint.setColor(SK_ColorTRANSPARENT);
     r = SkRect::MakeXYWH(SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize), 
                          SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
     canvas->drawRect(r, paint);
 
-    return surface->newImageSnapshot();
+    return surface->makeImageSnapshot();
 }
 
 // This GM tests the drawAtlas API with colors, different xfer modes
 // and transparency in the atlas image
 class DrawAtlasColorsGM : public skiagm::GM {
 public:
     DrawAtlasColorsGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
     }
     
 protected:
     SkString onShortName() override {
         return SkString("draw-atlas-colors");
     }
     
     SkISize onISize() override {
         return SkISize::Make(kNumXferModes * (kAtlasSize + kPad) + kPad,
                              2 * kNumColors * (kAtlasSize + kPad) + kTextPad + kPad);
     }
     
     void onDraw(SkCanvas* canvas) override {
         const SkRect target = SkRect::MakeWH(SkIntToScalar(kAtlasSize), SkIntToScalar(kAtlasSize));
 
         if (nullptr == fAtlas) {
-            fAtlas.reset(make_atlas(canvas, kAtlasSize));
+            fAtlas = make_atlas(canvas, kAtlasSize);
         }
 
         const struct {
             SkXfermode::Mode fMode;
             const char*      fLabel;
         } gModes[] = {
             { SkXfermode::kClear_Mode,      "Clear"     },
             { SkXfermode::kSrc_Mode,        "Src"       },
             { SkXfermode::kDst_Mode,        "Dst"       },
             { SkXfermode::kSrcOver_Mode,    "SrcOver"   },
@@ skipping 57 matching lines @@
             canvas->drawText(gModes[i].fLabel, strlen(gModes[i].fLabel),
                              i*(target.width()+kPad)+kPad, SkIntToScalar(kTextPad),
                              textP);
         }
 
         for (int i = 0; i < numModes; ++i) {
             canvas->save();            
             canvas->translate(SkIntToScalar(i*(target.height()+kPad)),
                               SkIntToScalar(kTextPad+kPad));
             // w/o a paint
-            canvas->drawAtlas(fAtlas, xforms, rects, quadColors, numColors, 
+            canvas->drawAtlas(fAtlas.get(), xforms, rects, quadColors, numColors,
                               gModes[i].fMode, nullptr, nullptr);
             canvas->translate(0.0f, numColors*(target.height()+kPad));
             // w a paint
-            canvas->drawAtlas(fAtlas, xforms, rects, quadColors, numColors, 
+            canvas->drawAtlas(fAtlas.get(), xforms, rects, quadColors, numColors,
                               gModes[i].fMode, nullptr, &paint);
             canvas->restore();        
         }
     }
     
 private:
     static const int kNumXferModes = 29;
     static const int kNumColors = 4;
     static const int kAtlasSize = 30;
     static const int kPad = 2;
     static const int kTextPad = 8;
 
 
-    SkAutoTUnref<SkImage> fAtlas;
+    sk_sp<SkImage> fAtlas;
 
     typedef GM INHERITED;
 };
 DEF_GM( return new DrawAtlasColorsGM; )