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/SamplePictFile.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/SamplePictFile.cpp')
| -rw-r--r-- | samplecode/SamplePictFile.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index 9203cbad77..ae10796901 100644 --- a/samplecode/SamplePictFile.cpp +++ b/samplecode/SamplePictFile.cpp @@ -117,7 +117,7 @@ protected: #endif if (!*picture) { - *picture = LoadPicture(fFilename.c_str(), fBBox); + *picture = LoadPicture(fFilename.c_str(), fBBox).release(); } if (*picture) { SkCounterDrawFilter filter(fCount); @@ -149,8 +149,8 @@ private: SkSize fTileSize; int fCount; - SkPicture* LoadPicture(const char path[], BBoxType bbox) { - SkAutoTUnref<SkPicture> pic; + sk_sp<SkPicture> LoadPicture(const char path[], BBoxType bbox) { + sk_sp<SkPicture> pic; SkBitmap bm; if (SkImageDecoder::DecodeFile(path, &bm)) { @@ -160,11 +160,11 @@ private: SkIntToScalar(bm.height()), nullptr, 0); can->drawBitmap(bm, 0, 0, nullptr); - pic.reset(recorder.endRecording()); + pic = recorder.finishRecordingAsPicture(); } else { SkFILEStream stream(path); if (stream.isValid()) { - pic.reset(SkPicture::CreateFromStream(&stream)); + pic = SkPicture::MakeFromStream(&stream); } else { SkDebugf("coun't load picture at \"path\"\n", path); } @@ -174,7 +174,7 @@ private: pic->playback(recorder.beginRecording(pic->cullRect().width(), pic->cullRect().height(), nullptr, 0)); - SkAutoTUnref<SkPicture> p2(recorder.endRecording()); + sk_sp<SkPicture> p2(recorder.finishRecordingAsPicture()); SkString path2(path); path2.append(".new.skp"); @@ -191,7 +191,7 @@ private: switch (bbox) { case kNo_BBoxType: // no bbox playback necessary - return pic.release(); + return std::move(pic); case kRTree_BBoxType: factory.reset(new SkRTreeFactory); break; @@ -203,7 +203,7 @@ private: pic->playback(recorder.beginRecording(pic->cullRect().width(), pic->cullRect().height(), factory.get(), 0)); - return recorder.endRecording(); + return recorder.finishRecordingAsPicture(); } typedef SampleView INHERITED; |