aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/core/SkPicture.h8
-rw-r--r--src/core/SkPicture.cpp20
2 files changed, 0 insertions, 28 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 85b2368814..5ca60ca82c 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -90,14 +90,6 @@ public:
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.
*/
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 0d8789a5d6..2afa4605b5 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -243,26 +243,6 @@ sk_sp<SkData> SkPicture::serialize(const SkSerialProcs* procs) const {
return stream.detachAsData();
}
-#ifdef SK_SUPPORT_LEGACY_SERIALPROCS_REF
-sk_sp<SkData> SkPicture::serialize(const SkSerialProcs& procs) const {
- return this->serialize(&procs);
-}
-sk_sp<SkPicture> SkPicture::MakeFromData(const SkData* data, const SkDeserialProcs& procs) {
- return SkPicture::MakeFromData(data, &procs);
-}
-
-sk_sp<SkPicture> SkPicture::MakeFromData(sk_sp<SkData> data, const SkDeserialProcs& procs) {
- return SkPicture::MakeFromData(std::move(data), &procs);
-}
-
-sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, const SkDeserialProcs& procs) {
- return SkPicture::MakeFromStream(stream, &procs);
-}
-sk_sp<SkPicture> SkPicture::MakeFromData(sk_sp<SkData> data, const SkDeserialProcs* procs) {
- return SkPicture::MakeFromData(data.get(), procs);
-}
-#endif
-
static sk_sp<SkData> custom_serialize(const SkPicture* picture, const SkSerialProcs& procs) {
if (procs.fPictureProc) {
auto data = procs.fPictureProc(const_cast<SkPicture*>(picture), procs.fPictureCtx);