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 /src/core/SkPicture.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 'src/core/SkPicture.cpp')
-rw-r--r-- | src/core/SkPicture.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index f2b199d317..c7e5e524b0 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -129,14 +129,14 @@ bool SkPicture::InternalOnly_BufferIsSKP(SkReadBuffer* buffer, SkPictInfo* pInfo return false; } -SkPicture* SkPicture::Forwardport(const SkPictInfo& info, const SkPictureData* data) { +sk_sp<SkPicture> SkPicture::Forwardport(const SkPictInfo& info, const SkPictureData* data) { if (!data) { return nullptr; } SkPicturePlayback playback(data); SkPictureRecorder r; playback.draw(r.beginRecording(info.fCullRect), nullptr/*no callback*/); - return r.endRecording(); + return r.finishRecordingAsPicture(); } static bool default_install(const void* src, size_t length, SkBitmap* dst) { @@ -145,17 +145,16 @@ static bool default_install(const void* src, size_t length, SkBitmap* dst) { SkImageGenerator::NewFromEncoded(encoded.get()), dst); } -SkPicture* SkPicture::CreateFromStream(SkStream* stream) { - return CreateFromStream(stream, &default_install, nullptr); +sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream) { + return MakeFromStream(stream, &default_install, nullptr); } -SkPicture* SkPicture::CreateFromStream(SkStream* stream, InstallPixelRefProc proc) { - return CreateFromStream(stream, proc, nullptr); +sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, InstallPixelRefProc proc) { + return MakeFromStream(stream, proc, nullptr); } -SkPicture* SkPicture::CreateFromStream(SkStream* stream, - InstallPixelRefProc proc, - SkTypefacePlayback* typefaces) { +sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, InstallPixelRefProc proc, + SkTypefacePlayback* typefaces) { SkPictInfo info; if (!InternalOnly_StreamIsSKP(stream, &info) || !stream->readBool()) { return nullptr; @@ -165,7 +164,7 @@ SkPicture* SkPicture::CreateFromStream(SkStream* stream, return Forwardport(info, data); } -SkPicture* SkPicture::CreateFromBuffer(SkReadBuffer& buffer) { +sk_sp<SkPicture> SkPicture::MakeFromBuffer(SkReadBuffer& buffer) { SkPictInfo info; if (!InternalOnly_BufferIsSKP(&buffer, &info) || !buffer.readBool()) { return nullptr; |