return pictures as sk_sp

gm/image_pict.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 "SkImage.h"
@@ skipping 17 matching lines @@
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(SK_ColorBLUE);
     canvas->drawOval(bounds, paint);
 }
 
 /*
  *  Exercise drawing pictures inside an image, showing that the image version is pixelated
  *  (correctly) when it is inside an image.
  */
 class ImagePictGM : public skiagm::GM {
-    SkAutoTUnref<SkPicture> fPicture;
+    sk_sp<SkPicture> fPicture;
     sk_sp<SkImage>   fImage0;
     sk_sp<SkImage>   fImage1;
 public:
     ImagePictGM() {}
 
 protected:
     SkString onShortName() override {
         return SkString("image-picture");
     }
 
     SkISize onISize() override {
         return SkISize::Make(850, 450);
     }
 
     void onOnceBeforeDraw() override {
         const SkRect bounds = SkRect::MakeXYWH(100, 100, 100, 100);
         SkPictureRecorder recorder;
         draw_something(recorder.beginRecording(bounds), bounds);
-        fPicture.reset(recorder.endRecording());
+        fPicture = recorder.finishRecordingAsPicture();
 
         // extract enough just for the oval.
         const SkISize size = SkISize::Make(100, 100);
 
         SkMatrix matrix;
         matrix.setTranslate(-100, -100);
-        fImage0 = SkImage::MakeFromPicture(sk_ref_sp(fPicture.get()), size, &matrix, nullptr);
+        fImage0 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr);
         matrix.postTranslate(-50, -50);
         matrix.postRotate(45);
         matrix.postTranslate(50, 50);
-        fImage1 = SkImage::MakeFromPicture(sk_ref_sp(fPicture.get()), size, &matrix, nullptr);
+        fImage1 = SkImage::MakeFromPicture(fPicture, size, &matrix, nullptr);
     }
 
     void drawSet(SkCanvas* canvas) const {
         SkMatrix matrix = SkMatrix::MakeTrans(-100, -100);
         canvas->drawPicture(fPicture, &matrix, nullptr);
         canvas->drawImage(fImage0.get(), 150, 0);
         canvas->drawImage(fImage1.get(), 300, 0);
     }
 
     void onDraw(SkCanvas* canvas) override {
@@ skipping 168 matching lines @@
     if (!ctx) {
         return new EmptyGenerator(info);
     }
     return new TextureGenerator(ctx, info, pic);
 }
 #endif
 
 class ImageCacheratorGM : public skiagm::GM {
     SkString                         fName;
     SkImageGenerator*                (*fFactory)(GrContext*, SkPicture*);
-    SkAutoTUnref<SkPicture>          fPicture;
+    sk_sp<SkPicture>                 fPicture;
     SkAutoTDelete<SkImageCacherator> fCache;
     SkAutoTDelete<SkImageCacherator> fCacheSubset;
 
 public:
     ImageCacheratorGM(const char suffix[], SkImageGenerator* (*factory)(GrContext*, SkPicture*))
         : fFactory(factory)
     {
         fName.printf("image-cacherator-from-%s", suffix);
     }
 
 protected:
     SkString onShortName() override {
         return fName;
     }
 
     SkISize onISize() override {
         return SkISize::Make(960, 450);
     }
 
     void onOnceBeforeDraw() override {
         const SkRect bounds = SkRect::MakeXYWH(100, 100, 100, 100);
         SkPictureRecorder recorder;
         draw_something(recorder.beginRecording(bounds), bounds);
-        fPicture.reset(recorder.endRecording());
+        fPicture = recorder.finishRecordingAsPicture();
     }
 
     void makeCaches(GrContext* ctx) {
-        auto gen = fFactory(ctx, fPicture);
+        auto gen = fFactory(ctx, fPicture.get());
         SkDEBUGCODE(const uint32_t genID = gen->uniqueID();)
         fCache.reset(SkImageCacherator::NewFromGenerator(gen));
 
         const SkIRect subset = SkIRect::MakeLTRB(50, 50, 100, 100);
 
-        gen = fFactory(ctx, fPicture);
+        gen = fFactory(ctx, fPicture.get());
         SkDEBUGCODE(const uint32_t genSubsetID = gen->uniqueID();)
         fCacheSubset.reset(SkImageCacherator::NewFromGenerator(gen, &subset));
 
         // whole caches should have the same ID as the generator. Subsets should be diff
         SkASSERT(fCache->uniqueID() == genID);
         SkASSERT(fCacheSubset->uniqueID() != genID);
         SkASSERT(fCacheSubset->uniqueID() != genSubsetID);
 
         SkASSERT(fCache->info().dimensions() == SkISize::Make(100, 100));
         SkASSERT(fCacheSubset->info().dimensions() == SkISize::Make(50, 50));
@@ skipping 68 matching lines @@
 };
 DEF_GM( return new ImageCacheratorGM("picture", make_pic_generator); )
 DEF_GM( return new ImageCacheratorGM("raster", make_ras_generator); )
 DEF_GM( return new ImageCacheratorGM("ctable", make_ctable_generator); )
 #if SK_SUPPORT_GPU
     DEF_GM( return new ImageCacheratorGM("texture", make_tex_generator); )
 #endif