From ca2622ba051829fed5f30facd74c5b41cd4b931c Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 18 Mar 2016 07:25:55 -0700 Subject: return pictures as sk_sp BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811703002 Review URL: https://codereview.chromium.org/1811703002 --- gm/picture.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/picture.cpp') diff --git a/gm/picture.cpp b/gm/picture.cpp index 1f8ded0bac..904046deb7 100644 --- a/gm/picture.cpp +++ b/gm/picture.cpp @@ -9,7 +9,7 @@ #include "SkPaint.h" #include "SkPictureRecorder.h" -static SkPicture* make_picture() { +static sk_sp make_picture() { SkPictureRecorder rec; SkCanvas* canvas = rec.beginRecording(100, 100); @@ -32,7 +32,7 @@ static SkPicture* make_picture() { 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 @@ -45,7 +45,7 @@ public: protected: void onOnceBeforeDraw() override { - fPicture.reset(make_picture()); + fPicture = make_picture(); } SkString onShortName() override { @@ -76,7 +76,7 @@ protected: } private: - SkAutoTUnref fPicture; + sk_sp fPicture; typedef skiagm::GM INHERITED; }; -- cgit v1.2.3