diff options
| author | reed <reed@google.com> | 2016-03-18 07:25:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 07:25:55 -0700 |
| commit | ca2622ba051829fed5f30facd74c5b41cd4b931c (patch) | |
| tree | 3d8248b7764e500f857b3d6cfb6866e72b632199 /samplecode/SampleApp.cpp | |
| parent | eb75c7db3a7372de68347d0df8d58acebc33a9ad (diff) | |
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
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 72122234d9..05d6ce0f7d 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -1389,7 +1389,7 @@ void SampleWindow::afterChildren(SkCanvas* orig) { } if (fSaveToSKP) { - SkAutoTUnref<const SkPicture> picture(fRecorder.endRecording()); + sk_sp<SkPicture> picture(fRecorder.finishRecordingAsPicture()); SkFILEWStream stream("sample_app.skp"); picture->serialize(&stream); fSaveToSKP = false; @@ -1398,7 +1398,7 @@ void SampleWindow::afterChildren(SkCanvas* orig) { } if (fUsePicture) { - SkAutoTUnref<const SkPicture> picture(fRecorder.endRecording()); + sk_sp<SkPicture> picture(fRecorder.finishRecordingAsPicture()); // serialize/deserialize? if (false) { @@ -1406,9 +1406,9 @@ void SampleWindow::afterChildren(SkCanvas* orig) { picture->serialize(&wstream); SkAutoTDelete<SkStream> rstream(wstream.detachAsStream()); - picture.reset(SkPicture::CreateFromStream(rstream)); + picture = SkPicture::MakeFromStream(rstream); } - orig->drawPicture(picture); + orig->drawPicture(picture.get()); } // Do this after presentGL and other finishing, rather than in afterChild |