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>

1 files changed, 20 insertions, 33 deletions

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index f5085a63f6..2761c417a6 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -143,13 +143,18 @@ 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::MakeFromStream(SkStream* stream) {
+    SkImageDeserializer factory;
+    return MakeFromStream(stream, &factory);
+}
+
 sk_sp<SkPicture> SkPicture::MakeFromData(const void* data, size_t size,
                                          SkImageDeserializer* factory) {
     SkMemoryStream stream(data, size);
@@ -163,28 +168,6 @@ sk_sp<SkPicture> SkPicture::MakeFromData(const SkData* data, SkImageDeserializer
     SkMemoryStream stream(data->data(), data->size());
     return MakeFromStream(&stream, factory);
 }
-#endif
-
-sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream) {
-    return MakeFromStream(stream, SkDeserialProcs(), nullptr);
-}
-
-sk_sp<SkPicture> SkPicture::MakeFromData(const void* data, size_t size) {
-    if (!data) {
-        return nullptr;
-    }
-    SkMemoryStream stream(data, size);
-    return MakeFromStream(&stream, SkDeserialProcs(), nullptr);
-}
-
-sk_sp<SkPicture> SkPicture::MakeFromData(const SkData* data) {
-    if (!data) {
-        return nullptr;
-    }
-    SkMemoryStream stream(data->data(), data->size());
-    return MakeFromStream(&stream, SkDeserialProcs(), nullptr);
-}
-
 
 sk_sp<SkPicture> SkPicture::MakeFromData(const SkData* data, const SkDeserialProcs& procs) {
     if (!data) {
@@ -382,13 +365,24 @@ bool SkPicture::PictureIOSecurityPrecautionsEnabled() {
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-
 sk_sp<SkData> PixelSerializer_SkSerialImageProc(SkImage* img, void* ctx) {
     SkASSERT(ctx);
     return img->encodeToData(static_cast<SkPixelSerializer*>(ctx));
 }
+
+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);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef SK_SUPPORT_LEGACY_SERIAL_BUFFER_OBJECTS
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+
 void SkBinaryWriteBuffer::setPixelSerializer(sk_sp<SkPixelSerializer> ps) {
     fPS = ps;
     if (ps) {
@@ -400,13 +394,6 @@ 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;