remove dead SK_SUPPORT_LEGACY_IMAGEDESERIALIZER code

Bug: skia:
Change-Id: I76be4b179ff23c8584b62b1bb0fa7a964c2ee97e
Reviewed-on: https://skia-review.googlesource.com/86320
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

4 files changed, 0 insertions, 59 deletions

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index f5085a63f6..ba1f228a63 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SkAtomics.h"
-#include "SkImageDeserializer.h"
 #include "SkImageGenerator.h"
 #include "SkMathPriv.h"
 #include "SkPicture.h"
@@ -143,28 +142,6 @@ sk_sp<SkPicture> SkPicture::Forwardport(const SkPictInfo& info,
     return r.finishRecordingAsPicture();
 }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
-sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, SkImageDeserializer* factory) {
-    SkDeserialProcs procs;
-    procs.fImageProc = ImageDeserializer_SkDeserialImageProc;
-    procs.fImageCtx  = factory;
-    return MakeFromStream(stream, procs, nullptr);
-}
-sk_sp<SkPicture> SkPicture::MakeFromData(const void* data, size_t size,
-                                         SkImageDeserializer* factory) {
-    SkMemoryStream stream(data, size);
-    return MakeFromStream(&stream, factory);
-}
-
-sk_sp<SkPicture> SkPicture::MakeFromData(const SkData* data, SkImageDeserializer* factory) {
-    if (!data) {
-        return nullptr;
-    }
-    SkMemoryStream stream(data->data(), data->size());
-    return MakeFromStream(&stream, factory);
-}
-#endif
-
 sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream) {
     return MakeFromStream(stream, SkDeserialProcs(), nullptr);
 }
@@ -400,21 +377,3 @@ void SkBinaryWriteBuffer::setPixelSerializer(sk_sp<SkPixelSerializer> ps) {
     }
 }
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
-sk_sp<SkImage> ImageDeserializer_SkDeserialImageProc(const void* data, size_t length, void* ctx) {
-    SkASSERT(ctx);
-    SkImageDeserializer* imd = static_cast<SkImageDeserializer*>(ctx);
-    const SkIRect* subset = nullptr;
-    return imd->makeFromMemory(data, length, subset);
-}
-void SkReadBuffer::setImageDeserializer(SkImageDeserializer* factory) {
-    if (factory) {
-        fProcs.fImageProc = ImageDeserializer_SkDeserialImageProc;
-        fProcs.fImageCtx  = factory;
-    } else {
-        fProcs.fImageProc = nullptr;
-        fProcs.fImageCtx  = nullptr;
-    }
-}
-#endif
-
diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp
index 94bf34af91..9d15c1f40e 100644
--- a/src/core/SkReadBuffer.cpp
+++ b/src/core/SkReadBuffer.cpp
@@ -8,7 +8,6 @@
 #include "SkBitmap.h"
 #include "SkDeduper.h"
 #include "SkImage.h"
-#include "SkImageDeserializer.h"
 #include "SkImageGenerator.h"
 #include "SkMakeUnique.h"
 #include "SkMathPriv.h"
diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h
index 28ea3d4d74..9c62a33770 100644
--- a/src/core/SkReadBuffer.h
+++ b/src/core/SkReadBuffer.h
@@ -216,10 +216,6 @@ public:
 
     void setDeserialProcs(const SkDeserialProcs& procs);
 
-#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
-    void setImageDeserializer(SkImageDeserializer* factory);
-#endif
-
     /**
      *  If isValid is false, sets the buffer to be "invalid". Returns true if the buffer
      *  is still valid.
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index af791b4380..2fcb34f865 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -418,19 +418,6 @@ sk_sp<SkImage> MakeTextureFromMipMap(GrContext*, const SkImageInfo&, const GrMip
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
-#include "SkImageDeserializer.h"
-
-sk_sp<SkImage> SkImageDeserializer::makeFromData(SkData* data, const SkIRect* subset) {
-    return SkImage::MakeFromEncoded(sk_ref_sp(data), subset);
-}
-sk_sp<SkImage> SkImageDeserializer::makeFromMemory(const void* data, size_t length,
-                                                   const SkIRect* subset) {
-    return SkImage::MakeFromEncoded(SkData::MakeWithCopy(data, length), subset);
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
 
 bool SkImage_pinAsTexture(const SkImage* image, GrContext* ctx) {
     SkASSERT(image);