From 834fb8ed906984739aee6b61417afddb9c6e469c Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Fri, 15 Dec 2017 11:20:28 -0500
Subject: 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>
---
 include/core/SkImageDeserializer.h |  2 ++
 include/core/SkPicture.h           | 12 +++++++++---
 include/core/SkWriteBuffer.h       |  8 --------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/core/SkImageDeserializer.h b/include/core/SkImageDeserializer.h
index ba1422647b..a8e37b69f0 100644
--- a/include/core/SkImageDeserializer.h
+++ b/include/core/SkImageDeserializer.h
@@ -14,6 +14,7 @@ struct SkIRect;
 class SkData;
 class SkImage;
 
+#ifdef SK_SUPPORT_LEGACY_IMAGEDESERIALIZER
 class SK_API SkImageDeserializer {
 public:
     virtual ~SkImageDeserializer() {}
@@ -32,5 +33,6 @@ public:
     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 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);
diff --git a/include/core/SkWriteBuffer.h b/include/core/SkWriteBuffer.h
index b0b6fd993a..0b1ae0c1aa 100644
--- a/include/core/SkWriteBuffer.h
+++ b/include/core/SkWriteBuffer.h
@@ -9,8 +9,6 @@
 #ifndef SkWriteBuffer_DEFINED
 #define SkWriteBuffer_DEFINED
 
-#define SK_SUPPORT_LEGACY_SERIAL_BUFFER_OBJECTS
-
 #include "SkData.h"
 #include "SkImage.h"
 #include "SkPath.h"
@@ -20,9 +18,7 @@
 #include "SkWriter32.h"
 #include "../private/SkTHash.h"
 
-#ifdef SK_SUPPORT_LEGACY_SERIAL_BUFFER_OBJECTS
 #include "SkPixelSerializer.h"
-#endif
 
 class SkBitmap;
 class SkDeduper;
@@ -157,9 +153,7 @@ public:
     SkFactorySet* setFactoryRecorder(SkFactorySet*);
     SkRefCntSet* setTypefaceRecorder(SkRefCntSet*);
 
-#ifdef SK_SUPPORT_LEGACY_SERIAL_BUFFER_OBJECTS
     void setPixelSerializer(sk_sp<SkPixelSerializer>);
-#endif
 
 private:
     const uint32_t fFlags;
@@ -171,9 +165,7 @@ private:
     // Only used if we do not have an fFactorySet
     SkTHashMap<SkString, uint32_t> fFlattenableDict;
 
-#ifdef SK_SUPPORT_LEGACY_SERIAL_BUFFER_OBJECTS
     sk_sp<SkPixelSerializer> fPS;
-#endif
 };
 
 #endif // SkWriteBuffer_DEFINED
-- 
cgit v1.2.3