return pictures as sk_sp

tools/skpmaker.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.
  *
  * Simple tool to generate SKP files for testing.
  */
 
 #include "SkCanvas.h"
@@ skipping 23 matching lines @@
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(width, height, nullptr, 0);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(SK_ColorBLACK);
     SkRect r = SkRect::MakeWH(width, height);
     canvas->drawRect(r, paint);
     paint.setColor(color);
     r.inset(border, border);
     canvas->drawRect(r, paint);
-    SkAutoTUnref<SkPicture> pict(recorder.endRecording());
     SkFILEWStream stream(writePath);
-    pict->serialize(&stream);
+    recorder.finishRecordingAsPicture()->serialize(&stream);
 }
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("Creates a simple .skp file for testing.");
     SkCommandLineFlags::Parse(argc, argv);
 
     // Validate flags.
     if ((FLAGS_blue < 0) || (FLAGS_blue > 255)) {
         SkDebugf("--blue must be within range [0,255]\n");
@@ skipping 26 matching lines @@
              SkIntToScalar(FLAGS_border), 
              color, FLAGS_writePath[0]);
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif