return pictures as sk_sp

samplecode/SamplePictFile.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 "SampleCode.h"
 #include "SkDumpCanvas.h"
 #include "SkView.h"
@@ skipping 99 matching lines @@
 
     void onDrawContent(SkCanvas* canvas) override {
         SkASSERT(static_cast<int>(fBBox) < kBBoxTypeCount);
         SkPicture** picture = fPictures + fBBox;
 
 #ifdef SK_GLYPHCACHE_TRACK_HASH_STATS
         SkGraphics::PurgeFontCache();
 #endif
 
         if (!*picture) {
-            *picture = LoadPicture(fFilename.c_str(), fBBox);
+            *picture = LoadPicture(fFilename.c_str(), fBBox).release();
         }
         if (*picture) {
             SkCounterDrawFilter filter(fCount);
             if (fCount > 0) {
                 canvas->setDrawFilter(&filter);
             }
             canvas->drawPicture(*picture);
             canvas->setDrawFilter(nullptr);
         }
 
@@ skipping 11 matching lines @@
         kLast_BBoxType = kRTree_BBoxType,
     };
     static const int kBBoxTypeCount = kLast_BBoxType + 1;
 
     SkString    fFilename;
     SkPicture*  fPictures[kBBoxTypeCount];
     BBoxType    fBBox;
     SkSize      fTileSize;
     int         fCount;
 
-    SkPicture* LoadPicture(const char path[], BBoxType bbox) {
-        SkAutoTUnref<SkPicture> pic;
+    sk_sp<SkPicture> LoadPicture(const char path[], BBoxType bbox) {
+        sk_sp<SkPicture> pic;
 
         SkBitmap bm;
         if (SkImageDecoder::DecodeFile(path, &bm)) {
             bm.setImmutable();
             SkPictureRecorder recorder;
             SkCanvas* can = recorder.beginRecording(SkIntToScalar(bm.width()),
                                                     SkIntToScalar(bm.height()),
                                                     nullptr, 0);
             can->drawBitmap(bm, 0, 0, nullptr);
-            pic.reset(recorder.endRecording());
+            pic = recorder.finishRecordingAsPicture();
         } else {
             SkFILEStream stream(path);
             if (stream.isValid()) {
-                pic.reset(SkPicture::CreateFromStream(&stream));
+                pic = SkPicture::MakeFromStream(&stream);
             } else {
                 SkDebugf("coun't load picture at \"path\"\n", path);
             }
 
             if (false) { // re-record
                 SkPictureRecorder recorder;
                 pic->playback(recorder.beginRecording(pic->cullRect().width(),
                                                       pic->cullRect().height(),
                                                       nullptr, 0));
-                SkAutoTUnref<SkPicture> p2(recorder.endRecording());
+                sk_sp<SkPicture> p2(recorder.finishRecordingAsPicture());
 
                 SkString path2(path);
                 path2.append(".new.skp");
                 SkFILEWStream writer(path2.c_str());
                 p2->serialize(&writer);
             }
         }
 
         if (nullptr == pic) {
             return nullptr;
         }
 
         SkAutoTDelete<SkBBHFactory> factory;
         switch (bbox) {
         case kNo_BBoxType:
             // no bbox playback necessary
-            return pic.release();
+            return std::move(pic);
         case kRTree_BBoxType:
             factory.reset(new SkRTreeFactory);
             break;
         default:
             SkASSERT(false);
         }
 
         SkPictureRecorder recorder;
         pic->playback(recorder.beginRecording(pic->cullRect().width(),
                                               pic->cullRect().height(),
                                               factory.get(), 0));
-        return recorder.endRecording();
+        return recorder.finishRecordingAsPicture();
     }
 
     typedef SampleView INHERITED;
 };
 
 SampleView* CreateSamplePictFileView(const char filename[]);
 SampleView* CreateSamplePictFileView(const char filename[]) {
     return new PictFileView(filename);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 #if 0
 static SkView* MyFactory() { return new PictFileView; }
 static SkViewRegister reg(MyFactory);
 #endif