return pictures as sk_sp

gm/pictureimagegenerator.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 "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 90 matching lines @@
 
     SkISize onISize() override {
         return SkISize::Make(1160, 860);
     }
 
     void onOnceBeforeDraw() override {
         const SkRect rect = SkRect::MakeWH(kPictureWidth, kPictureHeight);
         SkPictureRecorder recorder;
         SkCanvas* canvas = recorder.beginRecording(rect);
         draw_vector_logo(canvas, rect);
-        fPicture.reset(recorder.endRecording());
+        fPicture = recorder.finishRecordingAsPicture();
     }
 
     void onDraw(SkCanvas* canvas) override {
         const struct {
             SkISize  size;
             SkScalar scaleX, scaleY;
             SkScalar opacity;
         } configs[] = {
             { SkISize::Make(200, 100), 1, 1, 1 },
             { SkISize::Make(200, 200), 1, 1, 1 },
@@ skipping 42 matching lines @@
             p.setColor(0xfff0f0f0);
             p.setAlpha(255);
             canvas->drawRect(SkRect::MakeXYWH(x, y,
                                               SkIntToScalar(bm.width()),
                                               SkIntToScalar(bm.height())), p);
             canvas->drawBitmap(bm, x, y);
         }
     }
 
 private:
-    SkAutoTUnref<SkPicture> fPicture;
+    sk_sp<SkPicture> fPicture;
 
     const SkScalar kPictureWidth = 200;
     const SkScalar kPictureHeight = 100;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new PictureGeneratorGM;)