remove deprecated SkPixelSerializer

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

3 files changed, 7 insertions, 41 deletions

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index ba1f228a63..e12c059228 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -242,18 +242,13 @@ SkPictureData* SkPicture::backport() const {
     return new SkPictureData(rec, info);
 }
 
-void SkPicture::serialize(SkWStream* stream, SkPixelSerializer* pixelSerializer) const {
-    SkSerialProcs procs;
-    if (pixelSerializer) {
-        procs.fImageProc = PixelSerializer_SkSerialImageProc;
-        procs.fImageCtx  = pixelSerializer;
-    }
-    this->serialize(stream, procs, nullptr);
+void SkPicture::serialize(SkWStream* stream) const {
+    this->serialize(stream, SkSerialProcs(), nullptr);
 }
 
-sk_sp<SkData> SkPicture::serialize(SkPixelSerializer* pixelSerializer) const {
+sk_sp<SkData> SkPicture::serialize() const {
     SkDynamicMemoryWStream stream;
-    this->serialize(&stream, pixelSerializer);
+    this->serialize(&stream);
     return stream.detachAsData();
 }
 
@@ -356,24 +351,3 @@ void SkPicture::SetPictureIOSecurityPrecautionsEnabled_Dangerous(bool set) {
 bool SkPicture::PictureIOSecurityPrecautionsEnabled() {
     return g_AllPictureIOSecurityPrecautionsEnabled;
 }
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-
-sk_sp<SkData> PixelSerializer_SkSerialImageProc(SkImage* img, void* ctx) {
-    SkASSERT(ctx);
-    return img->encodeToData(static_cast<SkPixelSerializer*>(ctx));
-}
-void SkBinaryWriteBuffer::setPixelSerializer(sk_sp<SkPixelSerializer> ps) {
-    fPS = ps;
-    if (ps) {
-        fProcs.fImageProc = PixelSerializer_SkSerialImageProc;
-        fProcs.fImageCtx  = ps.get();
-    } else {
-        fProcs.fImageProc = nullptr;
-        fProcs.fImageCtx  = nullptr;
-    }
-}
-
diff --git a/src/core/SkPictureCommon.h b/src/core/SkPictureCommon.h
index c282f01fec..23d43fd65b 100644
--- a/src/core/SkPictureCommon.h
+++ b/src/core/SkPictureCommon.h
@@ -142,7 +142,6 @@ struct SkPathCounter {
     int fNumSlowPathsAndDashEffects;
 };
 
-sk_sp<SkData> PixelSerializer_SkSerialImageProc(SkImage*, void* pixelserializer);
 sk_sp<SkImage> ImageDeserializer_SkDeserialImageProc(const void*, size_t, void* imagedeserializer);
 
 #endif  // SkPictureCommon_DEFINED
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 2fcb34f865..09796cdd34 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -20,7 +20,6 @@
 #include "SkNextID.h"
 #include "SkPicture.h"
 #include "SkPixelRef.h"
-#include "SkPixelSerializer.h"
 #include "SkReadPixelsRec.h"
 #include "SkSpecialImage.h"
 #include "SkString.h"
@@ -102,10 +101,8 @@ sk_sp<SkData> SkImage::encodeToData(SkEncodedImageFormat type, int quality) cons
     return nullptr;
 }
 
-sk_sp<SkData> SkImage::encodeToData(SkPixelSerializer* serializer) const {
-    sk_sp<SkData> encoded(this->refEncodedData());
-    if (encoded &&
-        (!serializer || serializer->useEncodedData(encoded->data(), encoded->size()))) {
+sk_sp<SkData> SkImage::encodeToData() const {
+    if (auto encoded = this->refEncodedData()) {
         return encoded;
     }
 
@@ -113,11 +110,7 @@ sk_sp<SkData> SkImage::encodeToData(SkPixelSerializer* serializer) const {
     SkPixmap pmap;
     SkColorSpace* legacyColorSpace = nullptr;
     if (as_IB(this)->getROPixels(&bm, legacyColorSpace) && bm.peekPixels(&pmap)) {
-        if (serializer) {
-            return serializer->encodeToData(pmap);
-        } else {
-            return SkEncodePixmap(pmap, SkEncodedImageFormat::kPNG, 100);
-        }
+        return SkEncodePixmap(pmap, SkEncodedImageFormat::kPNG, 100);
     }
     return nullptr;
 }