return pictures as sk_sp

gm/image_shader.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 "SkData.h"
@@ skipping 54 matching lines @@
     make_texture,
     make_pict_gen,
     make_encode_gen,
 };
 
 /*
  *  Exercise drawing pictures inside an image, showing that the image version is pixelated
  *  (correctly) when it is inside an image.
  */
 class ImageShaderGM : public skiagm::GM {
-    SkAutoTUnref<SkPicture> fPicture;
+    sk_sp<SkPicture> fPicture;
 
 public:
     ImageShaderGM() {}
 
 protected:
     SkString onShortName() override {
         return SkString("image-shader");
     }
 
     SkISize onISize() override {
         return SkISize::Make(850, 450);
     }
 
     void onOnceBeforeDraw() override {
         const SkRect bounds = SkRect::MakeWH(100, 100);
         SkPictureRecorder recorder;
         draw_something(recorder.beginRecording(bounds), bounds);
-        fPicture.reset(recorder.endRecording());
+        fPicture = recorder.finishRecordingAsPicture();
     }
 
     void testImage(SkCanvas* canvas, SkImage* image) {
         SkAutoCanvasRestore acr(canvas, true);
 
         canvas->drawImage(image, 0, 0);
         canvas->translate(0, 120);
 
         const SkShader::TileMode tile = SkShader::kRepeat_TileMode;
         const SkMatrix localM = SkMatrix::MakeTrans(-50, -50);
         SkPaint paint;
         paint.setShader(image->makeShader(tile, tile, &localM));
         paint.setAntiAlias(true);
         canvas->drawCircle(50, 50, 50, paint);
     }
 
     void onDraw(SkCanvas* canvas) override {
         canvas->translate(20, 20);
 
         const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(gProcs); ++i) {
-            sk_sp<SkImage> image(gProcs[i](canvas->getGrContext(), fPicture, info));
+            sk_sp<SkImage> image(gProcs[i](canvas->getGrContext(), fPicture.get(), info));
             if (image) {
                 this->testImage(canvas, image.get());
             }
             canvas->translate(120, 0);
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 DEF_GM( return new ImageShaderGM; )