return pictures as sk_sp

tools/dump_record.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 "DumpRecord.h"
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
@@ skipping 31 matching lines @@
     for (int i = 0; i < FLAGS_skps.count(); i++) {
         if (SkCommandLineFlags::ShouldSkip(FLAGS_match, FLAGS_skps[i])) {
             continue;
         }
 
         SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(FLAGS_skps[i]));
         if (!stream) {
             SkDebugf("Could not read %s.\n", FLAGS_skps[i]);
             return 1;
         }
-        SkAutoTUnref<SkPicture> src(SkPicture::CreateFromStream(stream));
+        sk_sp<SkPicture> src(SkPicture::MakeFromStream(stream));
         if (!src) {
             SkDebugf("Could not read %s as an SkPicture.\n", FLAGS_skps[i]);
             return 1;
         }
         const int w = SkScalarCeilToInt(src->cullRect().width());
         const int h = SkScalarCeilToInt(src->cullRect().height());
 
         SkRecord record;
         SkRecorder canvas(&record, w, h);
         src->playback(&canvas);
 
         if (FLAGS_optimize) {
             SkRecordOptimize(&record);
         }
         if (FLAGS_optimize2) {
             SkRecordOptimize2(&record);
         }
 
         dump(FLAGS_skps[i], w, h, record);
 
         if (FLAGS_write.count() > 0) {
             SkPictureRecorder r;
             SkRecordDraw(record,
                          r.beginRecording(SkRect::MakeIWH(w, h)),
                          nullptr,
                          nullptr,
                          0,
                          nullptr,
                          nullptr);
-            SkAutoTUnref<SkPicture> dst(r.endRecording());
+            sk_sp<SkPicture> dst(r.finishRecordingAsPicture());
             SkFILEWStream ostream(FLAGS_write[0]);
             dst->serialize(&ostream);
         }
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif