diff options
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); |