return pictures as sk_sp

tools/gpuveto.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 "SkCommandLineFlags.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
@@ skipping 23 matching lines @@
     }
 
     SkFILEStream inputStream(FLAGS_readFile[0]);
     if (!inputStream.isValid()) {
         if (!FLAGS_quiet) {
             SkDebugf("Couldn't open file\n");
         }
         return kError;
     }
 
-    SkAutoTUnref<SkPicture> picture(SkPicture::CreateFromStream(&inputStream));
-    if (nullptr == picture.get()) {
+    sk_sp<SkPicture> picture(SkPicture::MakeFromStream(&inputStream));
+    if (nullptr == picture) {
         if (!FLAGS_quiet) {
             SkDebugf("Could not read the SkPicture\n");
         }
         return kError;
     }
 
     // The SkPicture tracking information is only generated during recording
     // an isn't serialized. Replay the picture to regenerated the tracking data.
     SkPictureRecorder recorder;
     picture->playback(recorder.beginRecording(picture->cullRect().width(), 
                                               picture->cullRect().height(), 
                                               nullptr, 0));
-    SkAutoTUnref<SkPicture> recorded(recorder.endRecording());
+    sk_sp<SkPicture> recorded(recorder.finishRecordingAsPicture());
 
     if (recorded->suitableForGpuRasterization(nullptr)) {
         SkDebugf("suitable\n");
     } else {
         SkDebugf("unsuitable\n");
     }
 
     return kSuccess;
 #else
     SkDebugf("gpuveto is only useful when GPU rendering is enabled\n");
     return kError;
 #endif
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif