diff options
| author |  kjlubick <kjlubick@google.com> | 2016-02-10 11:25:07 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-10 11:25:07 -0800 |
| commit | 1de415f2c33febbac668500afbbb0c9b120c125f (patch) | |
| tree | 6fea38167e591a5908c024866851a294dbd8e4c5 /include | |
| parent | 026388a01864c74208ad57d1ba4f711602d101c6 (diff) | |
Revert of Make SkPicture/SkImageGenerator default to SkCodec (patchset #7 id:120001 of https://codereview.chromium.org/1671193002/ )
Reason for revert:
Breaks Ubuntu and Mac CMAKE
Original issue's description:
> Make SkPicture/SkImageGenerator default to SkCodec
>
> Remove reference to SkImageDecoder from SkPicture. Make the default
> InstallPixelRefProc passed to CreateFromStream use
> SkImageGenerator::NewFromEncoded instead.
>
> Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
> Remove the old version that used SkImageDecoder.
>
> Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
> now behaves lazily.
>
> Update all clients to use the default.
>
> Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.
>
> BUG=skia:4691
> BUG=skia:4290
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002
>
> Committed: https://skia.googlesource.com/skia/+/026388a01864c74208ad57d1ba4f711602d101c6
TBR=msarett@google.com,reed@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4691
Review URL: https://codereview.chromium.org/1685963004
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPicture.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 7c8c187fd8..720747e9a3 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -54,19 +54,8 @@ public: * @return A new SkPicture representing the serialized data, or NULL if the stream is * invalid. */ - static SkPicture* CreateFromStream(SkStream*, InstallPixelRefProc proc); - - /** - * Recreate a picture that was serialized into a stream. - * - * Any serialized images in the stream will be passed to - * SkImageGenerator::NewFromEncoded. - * - * @param SkStream Serialized picture data. Ownership is unchanged by this call. - * @return A new SkPicture representing the serialized data, or NULL if the stream is - * invalid. - */ - static SkPicture* CreateFromStream(SkStream*); + static SkPicture* CreateFromStream(SkStream*, + InstallPixelRefProc proc = &SkImageDecoder::DecodeMemory); /** * Recreate a picture that was serialized into a buffer. If the creation requires bitmap |