return pictures as sk_sp

bench/PictureNestingBench.cpp

 /*
  * Copyright 2014 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"
@@ skipping 56 matching lines @@
             pics += this->sierpinsky(c, lvl, paint);
 
             c->translate(1, 0);
             pics += this->sierpinsky(c, lvl, paint);
 
             c->translate(-0.5, -1);
             pics += this->sierpinsky(c, lvl, paint);
         c->restore();
 
         if (recordPicture) {
-            SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-            canvas->drawPicture(picture);
+            canvas->drawPicture(recorder.finishRecordingAsPicture());
         }
 
         return pics;
     }
 
     int fMaxLevel;
     int fMaxPictureLevel;
 
 private:
     int countPics() const {
@@ skipping 29 matching lines @@
     }
 
     void onDraw(int loops, SkCanvas*) override {
         SkIPoint canvasSize = onGetSize();
         SkPictureRecorder recorder;
 
         for (int i = 0; i < loops; i++) {
             SkCanvas* c = recorder.beginRecording(SkIntToScalar(canvasSize.x()),
                                                   SkIntToScalar(canvasSize.y()));
             this->doDraw(c);
-            SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+            (void)recorder.finishRecordingAsPicture();
         }
     }
 
 private:
     typedef PictureNesting INHERITED;
 };
 
 class PictureNestingPlayback : public PictureNesting {
 public:
     PictureNestingPlayback(int maxLevel, int maxPictureLevel)
         : INHERITED("playback", maxLevel, maxPictureLevel) {
     }
 protected:
     void onDelayedSetup() override {
         this->INHERITED::onDelayedSetup();
 
         SkIPoint canvasSize = onGetSize();
         SkPictureRecorder recorder;
         SkCanvas* c = recorder.beginRecording(SkIntToScalar(canvasSize.x()),
                                               SkIntToScalar(canvasSize.y()));
 
         this->doDraw(c);
-        fPicture.reset(recorder.endRecording());
+        fPicture = recorder.finishRecordingAsPicture();
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
         for (int i = 0; i < loops; i++) {
             canvas->drawPicture(fPicture);
         }
     }
 
 private:
-    SkAutoTUnref<SkPicture> fPicture;
+    sk_sp<SkPicture> fPicture;
 
     typedef PictureNesting INHERITED;
 };
 
 DEF_BENCH( return new PictureNestingRecording(8, 0); )
 DEF_BENCH( return new PictureNestingRecording(8, 1); )
 DEF_BENCH( return new PictureNestingRecording(8, 2); )
 DEF_BENCH( return new PictureNestingRecording(8, 3); )
 DEF_BENCH( return new PictureNestingRecording(8, 4); )
 DEF_BENCH( return new PictureNestingRecording(8, 5); )
 DEF_BENCH( return new PictureNestingRecording(8, 6); )
 DEF_BENCH( return new PictureNestingRecording(8, 7); )
 DEF_BENCH( return new PictureNestingRecording(8, 8); )
 
 DEF_BENCH( return new PictureNestingPlayback(8, 0); )
 DEF_BENCH( return new PictureNestingPlayback(8, 1); )
 DEF_BENCH( return new PictureNestingPlayback(8, 2); )
 DEF_BENCH( return new PictureNestingPlayback(8, 3); )
 DEF_BENCH( return new PictureNestingPlayback(8, 4); )
 DEF_BENCH( return new PictureNestingPlayback(8, 5); )
 DEF_BENCH( return new PictureNestingPlayback(8, 6); )
 DEF_BENCH( return new PictureNestingPlayback(8, 7); )
 DEF_BENCH( return new PictureNestingPlayback(8, 8); )