return pictures as sk_sp

gm/verylargebitmap.cpp

 /*
  * Copyright 2012 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 "SkGradientShader.h"
@@ skipping 13 matching lines @@
 
 static sk_sp<SkImage> make_raster_image(int width, int height, SkColor colors[2]) {
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(width, height));
     draw(surface->getCanvas(), width, height, colors);
     return surface->makeImageSnapshot();
 }
 
 static sk_sp<SkImage> make_picture_image(int width, int height, SkColor colors[2]) {
     SkPictureRecorder recorder;
     draw(recorder.beginRecording(SkRect::MakeIWH(width, height)), width, height, colors);
-    SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-    return SkImage::MakeFromPicture(sk_ref_sp(picture.get()), SkISize::Make(width, height),
-                                    nullptr, nullptr);
+    return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(),
+                                    SkISize::Make(width, height), nullptr, nullptr);
 }
 
 typedef sk_sp<SkImage> (*ImageMakerProc)(int width, int height, SkColor colors[2]);
 
 static void show_image(SkCanvas* canvas, int width, int height, SkColor colors[2],
                        ImageMakerProc proc) {
     sk_sp<SkImage> image(proc(width, height, colors));
 
     SkPaint paint;
     SkRect r;
@@ skipping 68 matching lines @@
         // since it has a 64K limit on x,y coordinates... (but gpu should succeed)
         show_image(canvas, veryBig, small, colors, fProc);
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 DEF_GM( return new VeryLargeBitmapGM(make_raster_image, "bitmap"); )
 DEF_GM( return new VeryLargeBitmapGM(make_picture_image, "_picture_image"); )