return pictures as sk_sp

gm/picture.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 "gm.h"
 #include "SkPaint.h"
 #include "SkPictureRecorder.h"
 
-static SkPicture* make_picture() {
+static sk_sp<SkPicture> make_picture() {
     SkPictureRecorder rec;
     SkCanvas* canvas = rec.beginRecording(100, 100);
 
     SkPaint paint;
     paint.setAntiAlias(true);
     SkPath path;
 
     paint.setColor(0x800000FF);
     canvas->drawRect(SkRect::MakeWH(100, 100), paint);
 
     paint.setColor(0x80FF0000);
     path.moveTo(0, 0); path.lineTo(100, 0); path.lineTo(100, 100);
     canvas->drawPath(path, paint);
     
     paint.setColor(0x8000FF00);
     path.reset(); path.moveTo(0, 0); path.lineTo(100, 0); path.lineTo(0, 100);
     canvas->drawPath(path, paint);
 
     paint.setColor(0x80FFFFFF);
     paint.setXfermodeMode(SkXfermode::kPlus_Mode);
     canvas->drawRect(SkRect::MakeXYWH(25, 25, 50, 50), paint);
 
-    return rec.endRecording();
+    return rec.finishRecordingAsPicture();
 }
 
 // Exercise the optional arguments to drawPicture
 //
 class PictureGM : public skiagm::GM {
 public:
     PictureGM()
         : fPicture(nullptr)
     {}
 
 protected:
     void onOnceBeforeDraw() override {
-         fPicture.reset(make_picture());
+         fPicture = make_picture();
     }
 
     SkString onShortName() override {
         return SkString("pictures");
     }
 
     SkISize onISize() override {
         return SkISize::Make(450, 120);
     }
 
@@ skipping 10 matching lines @@
         
         matrix.postTranslate(110, 0);
         canvas->drawPicture(fPicture, &matrix, &paint);
 
         paint.setAlpha(0x80);
         matrix.postTranslate(110, 0);
         canvas->drawPicture(fPicture, &matrix, &paint);
     }
 
 private:
-    SkAutoTUnref<SkPicture> fPicture;
+    sk_sp<SkPicture> fPicture;
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM(return new PictureGM;)