From bdc453db784bd91e5cee55004075bb195ca7a743 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Thu, 21 Dec 2017 16:27:20 -0500 Subject: [PATCH] remove dead code behind SK_SUPPORT_LEGACY_SERIALPROCS_REF Bug: skia: Change-Id: Iba5ad1e8d5c74c79627cabbbbe4e835278553609 Reviewed-on: https://skia-review.googlesource.com/88820 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- include/core/SkPicture.h | 8 -------- src/core/SkPicture.cpp | 20 -------------------- 2 files changed, 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 serialize(const SkSerialProcs* = nullptr) const; void serialize(SkWStream*, const SkSerialProcs* = nullptr) const; -#ifdef SK_SUPPORT_LEGACY_SERIALPROCS_REF - sk_sp serialize(const SkSerialProcs&) const; - static sk_sp MakeFromStream(SkStream*, const SkDeserialProcs& procs); - static sk_sp MakeFromData(const SkData* data, const SkDeserialProcs& procs); - static sk_sp MakeFromData(sk_sp data, const SkDeserialProcs& procs); - static sk_sp MakeFromData(sk_sp, 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 SkPicture::serialize(const SkSerialProcs* procs) const { return stream.detachAsData(); } -#ifdef SK_SUPPORT_LEGACY_SERIALPROCS_REF -sk_sp SkPicture::serialize(const SkSerialProcs& procs) const { - return this->serialize(&procs); -} -sk_sp SkPicture::MakeFromData(const SkData* data, const SkDeserialProcs& procs) { - return SkPicture::MakeFromData(data, &procs); -} - -sk_sp SkPicture::MakeFromData(sk_sp data, const SkDeserialProcs& procs) { - return SkPicture::MakeFromData(std::move(data), &procs); -} - -sk_sp SkPicture::MakeFromStream(SkStream* stream, const SkDeserialProcs& procs) { - return SkPicture::MakeFromStream(stream, &procs); -} -sk_sp SkPicture::MakeFromData(sk_sp data, const SkDeserialProcs* procs) { - return SkPicture::MakeFromData(data.get(), procs); -} -#endif - static sk_sp custom_serialize(const SkPicture* picture, const SkSerialProcs& procs) { if (procs.fPictureProc) { auto data = procs.fPictureProc(const_cast(picture), procs.fPictureCtx);