return pictures as sk_sp

bench/PicturePlaybackBench.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkPaint.h"
@@ skipping 24 matching lines @@
 protected:
     virtual const char* onGetName() {
         return fName.c_str();
     }
 
     virtual void onDraw(int loops, SkCanvas* canvas) {
 
         SkPictureRecorder recorder;
         SkCanvas* pCanvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT, nullptr, 0);
         this->recordCanvas(pCanvas);
-        SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+        sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
 
         const SkPoint translateDelta = getTranslateDelta(loops);
 
         for (int i = 0; i < loops; i++) {
             picture->playback(canvas);
             canvas->translate(translateDelta.fX, translateDelta.fY);
         }
     }
 
     virtual void recordCanvas(SkCanvas* canvas) = 0;
@@ skipping 119 matching lines @@
             for (int i = 0; i < 10000; i++) {
                 SkScalar x = rand.nextRangeScalar(0, 1024),
                          y = rand.nextRangeScalar(0, 1024),
                          w = rand.nextRangeScalar(0, 128),
                          h = rand.nextRangeScalar(0, 128);
                 SkPaint paint;
                 paint.setColor(rand.nextU());
                 paint.setAlpha(0xFF);
                 canvas->drawRect(SkRect::MakeXYWH(x,y,w,h), paint);
             }
-        fPic.reset(recorder.endRecording());
+        fPic = recorder.finishRecordingAsPicture();
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
         for (int i = 0; i < loops; i++) {
             // This inner loop guarantees we make the same choices for all bench variants.
             SkRandom rand;
             for (int j = 0; j < 10; j++) {
                 SkScalar x = 0, y = 0;
                 switch (fMode) {
                     case kTiled:  x = SkScalar(256 * rand.nextULessThan(4));
                                   y = SkScalar(256 * rand.nextULessThan(4));
                                   break;
                     case kRandom: x = rand.nextRangeScalar(0, 768);
                                   y = rand.nextRangeScalar(0, 768);
                                   break;
                 }
                 SkAutoCanvasRestore ar(canvas, true/*save now*/);
                 canvas->clipRect(SkRect::MakeXYWH(x,y,256,256));
                 fPic->playback(canvas);
             }
         }
     }
 
 private:
-    BBH                     fBBH;
-    Mode                    fMode;
-    SkString                fName;
-    SkAutoTUnref<SkPicture> fPic;
+    BBH                 fBBH;
+    Mode                fMode;
+    SkString            fName;
+    sk_sp<SkPicture>    fPic;
 };
 
 DEF_BENCH( return new TiledPlaybackBench(kNone,     kRandom); )
 DEF_BENCH( return new TiledPlaybackBench(kNone,     kTiled ); )
 DEF_BENCH( return new TiledPlaybackBench(kRTree,    kRandom); )
 DEF_BENCH( return new TiledPlaybackBench(kRTree,    kTiled ); )