aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/picture.cpp
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-03-18 07:25:55 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-18 07:25:55 -0700
commitca2622ba051829fed5f30facd74c5b41cd4b931c (patch)
tree3d8248b7764e500f857b3d6cfb6866e72b632199 /gm/picture.cpp
parenteb75c7db3a7372de68347d0df8d58acebc33a9ad (diff)
return pictures as sk_sp
Diffstat (limited to 'gm/picture.cpp')
-rw-r--r--gm/picture.cpp8
1 files changed, 4 insertions, 4 deletions
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<SkPicture> 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<SkPicture> fPicture;
+ sk_sp<SkPicture> fPicture;
typedef skiagm::GM INHERITED;
};