diff options
| author |  Mike Reed <reed@google.com> | 2017-12-15 11:20:28 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-15 16:49:38 +0000 |
| commit | 834fb8ed906984739aee6b61417afddb9c6e469c (patch) | |
| tree | 8827a7284f12c8ce6e8c4cdc956c3e6326974c5f /include/core/SkPicture.h | |
| parent | 0c5f54663b3080819825bd035979a82d4c5ac902 (diff) | |
hide SkImageDeserializer
Bug: skia:
Change-Id: I1cd4e8c626628a3e6426afd7d6bae628d58989c3
Reviewed-on: https://skia-review.googlesource.com/85743
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkPicture.h')
| -rw-r--r-- | include/core/SkPicture.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index 1e32636ca3..cb8dcc2215 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -19,7 +19,9 @@ class SkCanvas; class SkData; struct SkDeserialProcs; class SkImage; +#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER class SkImageDeserializer; +#endif class SkPath; class SkPictureData; class SkPixelSerializer; @@ -58,11 +60,15 @@ public: * Any serialized images in the stream will be passed the image-deserializer, or if that is * null, to the default deserializer that will call SkImage::MakeFromEncoded(). */ +#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER static sk_sp<SkPicture> MakeFromStream(SkStream*, SkImageDeserializer*); + static sk_sp<SkPicture> MakeFromData(const SkData* data, SkImageDeserializer*); + static sk_sp<SkPicture> MakeFromData(const void* data, size_t size, SkImageDeserializer*); +#endif + static sk_sp<SkPicture> MakeFromStream(SkStream*); - static sk_sp<SkPicture> MakeFromData(const void* data, size_t size, - SkImageDeserializer* = nullptr); - static sk_sp<SkPicture> MakeFromData(const SkData* data, SkImageDeserializer* = nullptr); + static sk_sp<SkPicture> MakeFromData(const SkData* data); + static sk_sp<SkPicture> MakeFromData(const void* data, size_t size); static sk_sp<SkPicture> MakeFromStream(SkStream*, const SkDeserialProcs& procs); static sk_sp<SkPicture> MakeFromData(const SkData* data, const SkDeserialProcs& procs); |