update callsites for Make image factories

samplecode/SampleAtlas.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 "SampleCode.h"
 #include "SkAnimTimer.h"
 #include "SkView.h"
@@ skipping 21 matching lines @@
         matrix.setRSXform(xform[i]);
         
         canvas->save();
         canvas->concat(matrix);
         canvas->drawImageRect(atlas, tex[i], tex[i].makeOffset(-tex[i].x(), -tex[i].y()), paint,
                               SkCanvas::kFast_SrcRectConstraint);
         canvas->restore();
     }
 }
 
-static SkImage* make_atlas(int atlasSize, int cellSize) {
+static sk_sp<SkImage> make_atlas(int atlasSize, int cellSize) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(atlasSize, atlasSize);
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
     SkCanvas* canvas = surface->getCanvas();
 
     SkPaint paint;
     paint.setAntiAlias(true);
     SkRandom rand;
 
     const SkScalar half = cellSize * SK_ScalarHalf;
     const char* s = "01234567890!@#$%^&*=+<>?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
     paint.setTextSize(28);
     paint.setTextAlign(SkPaint::kCenter_Align);
     int i = 0;
     for (int y = 0; y < atlasSize; y += cellSize) {
         for (int x = 0; x < atlasSize; x += cellSize) {
             paint.setColor(rand.nextU());
             paint.setAlpha(0xFF);
             int index = i % strlen(s);
             canvas->drawText(&s[index], 1, x + half, y + half + half/2, paint);
             i += 1;
         }
     }
-    return surface->newImageSnapshot();
+    return surface->makeImageSnapshot();
 }
 
 class DrawAtlasDrawable : public SkDrawable {
     enum {
         kMaxScale = 2,
         kCellSize = 32,
         kAtlasSize = 512,
     };
 
     struct Rec {
@@ skipping 48 matching lines @@
                                               SkScalarHalf(kCellSize), SkScalarHalf(kCellSize));
         }
     };
 
     DrawAtlasProc fProc;
 
     enum {
         N = 256,
     };
 
-    SkAutoTUnref<SkImage> fAtlas;
+    sk_sp<SkImage> fAtlas;
     Rec         fRec[N];
     SkRect      fTex[N];
     SkRect      fBounds;
     bool        fUseColors;
 
 public:
     DrawAtlasDrawable(DrawAtlasProc proc, const SkRect& r)
         : fProc(proc), fBounds(r), fUseColors(false)
     {
         SkRandom rand;
-        fAtlas.reset(make_atlas(kAtlasSize, kCellSize));
+        fAtlas = make_atlas(kAtlasSize, kCellSize);
         const SkScalar kMaxSpeed = 5;
         const SkScalar cell = SkIntToScalar(kCellSize);
         int i = 0;
         for (int y = 0; y < kAtlasSize; y += kCellSize) {
             for (int x = 0; x < kAtlasSize; x += kCellSize) {
                 const SkScalar sx = SkIntToScalar(x);
                 const SkScalar sy = SkIntToScalar(y);
                 fTex[i].setXYWH(sx, sy, cell, cell);
                 
                 fRec[i].fCenter.set(sx + cell/2, sy + 3*cell/4);
@@ skipping 24 matching lines @@
             xform[i] = fRec[i].asRSXform();
             if (fUseColors) {
                 colors[i] = SkColorSetARGB((int)(fRec[i].fAlpha * 0xFF), 0xFF, 0xFF, 0xFF);
             }
         }
         SkPaint paint;
         paint.setFilterQuality(kLow_SkFilterQuality);
 
         const SkRect cull = this->getBounds();
         const SkColor* colorsPtr = fUseColors ? colors : nullptr;
-        fProc(canvas, fAtlas, xform, fTex, colorsPtr, N, &cull, &paint);
+        fProc(canvas, fAtlas.get(), xform, fTex, colorsPtr, N, &cull, &paint);
     }
     
     SkRect onGetBounds() override {
         const SkScalar border = kMaxScale * kCellSize;
         SkRect r = fBounds;
         r.outset(border, border);
         return r;
     }
 
 private:
@@ skipping 44 matching lines @@
 #endif
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_SAMPLE( return new DrawAtlasView("DrawAtlas", draw_atlas); )
 DEF_SAMPLE( return new DrawAtlasView("DrawAtlasSim", draw_atlas_sim); )