Revert "Revert "hide SkImageDeserializer""

This reverts commit 36d71787929002511edc37663b56d5909d2600cf.

Reason for revert: google3 updated

Original change's description:
> Revert "hide SkImageDeserializer"
> 
> This reverts commit 834fb8ed906984739aee6b61417afddb9c6e469c.
> 
> Reason for revert: broke google3
> 
> Original change's description:
> > hide SkImageDeserializer
> > 
> > Bug: skia:
> > Change-Id: I1cd4e8c626628a3e6426afd7d6bae628d58989c3
> > Reviewed-on: https://skia-review.googlesource.com/85743
> > Reviewed-by: Mike Reed <reed@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> 
> TBR=reed@google.com,reed@chromium.org
> 
> Change-Id: I00679c8651817af1777785da6c8dac9411a2a7c2
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/85880
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=reed@google.com,reed@chromium.org

Change-Id: Icce36dfb9570ccf79f165076c59aa4de49fb6040
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/86100
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 1e32636ca3..cb8dcc2215 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -19,7 +19,9 @@ class SkCanvas;
 class SkData;
 struct SkDeserialProcs;
 class SkImage;
+#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
 class SkImageDeserializer;
+#endif
 class SkPath;
 class SkPictureData;
 class SkPixelSerializer;
@@ -58,11 +60,15 @@ public:
      *  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().
      */
+#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 void* data, size_t size,
-                                         SkImageDeserializer* = nullptr);
-    static sk_sp<SkPicture> MakeFromData(const SkData* data, SkImageDeserializer* = nullptr);
+    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);