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>

2 files changed, 1 insertions, 50 deletions

diff --git a/include/core/SkImageDeserializer.h b/include/core/SkImageDeserializer.h
deleted file mode 100644
index a8e37b69f0..0000000000
--- a/include/core/SkImageDeserializer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkImageDeserializer_DEFINED
-#define SkImageDeserializer_DEFINED
-
-#include "SkRefCnt.h"
-
-struct SkIRect;
-class SkData;
-class SkImage;
-
-#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
-class SK_API SkImageDeserializer {
-public:
-    virtual ~SkImageDeserializer() {}
-
-    /**
-     *  Given a data containing serialized content, return an SkImage from it.
-     *
-     *  @param data The data containing the encoded image. The subclass may ref this for later
-     *              decoding, or read it and process it immediately.
-     *  @param subset Optional rectangle represent the subset of the encoded data that is being
-     *                requested to be turned into an image.
-     *  @return The new image, or nullptr on failure.
-     *
-     *  The default implementation is to call SkImage::MakeFromEncoded(...)
-     */
-    virtual sk_sp<SkImage> makeFromData(SkData*, const SkIRect* subset);
-    virtual sk_sp<SkImage> makeFromMemory(const void* data, size_t length, const SkIRect* subset);
-};
-#endif
-
-#endif
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index cb8dcc2215..016be3759a 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -19,9 +19,6 @@ class SkCanvas;
 class SkData;
 struct SkDeserialProcs;
 class SkImage;
-#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
-class SkImageDeserializer;
-#endif
 class SkPath;
 class SkPictureData;
 class SkPixelSerializer;
@@ -55,16 +52,8 @@ public:
     typedef bool (*InstallPixelRefProc)(const void* src, size_t length, SkBitmap* dst);
 
     /**
-     *  Recreate a picture that was serialized into a stream.
-     *
-     *  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().
+     *  Recreate a picture that was serialized into a stream or data.
      */
-#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 SkData* data);