diff options
| author |  Mike Reed <reed@google.com> | 2017-12-20 14:12:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-21 12:36:30 +0000 |
| commit | 47fdf6c85ee8151c14529e5322d63636c36ecdb8 (patch) | |
| tree | 34529464c15c50efa305107199189687907ee759 /include/core/SkPicture.h | |
| parent | e3edf9274485f49d9f335052cb31812743e15634 (diff) | |
add serialprocs to MultiDocument, hide redundant methods
Bug: skia:
Change-Id: I6521e93af79439bd8c1d2f5130a68492044a2ee9
Reviewed-on: https://skia-review.googlesource.com/87788
Reviewed-by: Wei Li <weili@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkPicture.h')
| -rw-r--r-- | include/core/SkPicture.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index ba01a929f6..85b2368814 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -38,13 +38,10 @@ public: * Recreate a picture that was serialized into a stream or data. */ - static sk_sp<SkPicture> MakeFromStream(SkStream*); - 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); - static sk_sp<SkPicture> MakeFromData(sk_sp<SkData> data, const SkDeserialProcs& procs); + static sk_sp<SkPicture> MakeFromStream(SkStream*, const SkDeserialProcs* = nullptr); + static sk_sp<SkPicture> MakeFromData(const SkData* data, const SkDeserialProcs* = nullptr); + static sk_sp<SkPicture> MakeFromData(const void* data, size_t size, + const SkDeserialProcs* = nullptr); /** * Recreate a picture that was serialized into a buffer. If the creation requires bitmap @@ -90,9 +87,16 @@ public: /** Returns a non-zero value unique among all pictures. */ uint32_t uniqueID() const; - sk_sp<SkData> serialize() const; - void serialize(SkWStream*) const; + sk_sp<SkData> serialize(const SkSerialProcs* = nullptr) const; + void serialize(SkWStream*, const SkSerialProcs* = nullptr) const; + +#ifdef SK_SUPPORT_LEGACY_SERIALPROCS_REF sk_sp<SkData> serialize(const SkSerialProcs&) const; + static sk_sp<SkPicture> MakeFromStream(SkStream*, const SkDeserialProcs& procs); + static sk_sp<SkPicture> MakeFromData(const SkData* data, const SkDeserialProcs& procs); + static sk_sp<SkPicture> MakeFromData(sk_sp<SkData> data, const SkDeserialProcs& procs); + static sk_sp<SkPicture> MakeFromData(sk_sp<SkData>, const SkDeserialProcs* = nullptr); +#endif /** * Serialize to a buffer. @@ -121,8 +125,8 @@ private: friend class SkEmptyPicture; template <typename> friend class SkMiniPicture; - void serialize(SkWStream*, const SkSerialProcs&, SkRefCntSet* typefaces) const; - static sk_sp<SkPicture> MakeFromStream(SkStream*, const SkDeserialProcs&, SkTypefacePlayback*); + void serialize(SkWStream*, const SkSerialProcs*, SkRefCntSet* typefaces) const; + static sk_sp<SkPicture> MakeFromStream(SkStream*, const SkDeserialProcs*, SkTypefacePlayback*); friend class SkPictureData; /** Return true if the SkStream/Buffer represents a serialized picture, and |