aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkPicture.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-12-16 08:41:28 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-16 14:21:32 +0000
commitef0384835757df463f5157145650a60ba8b14a63 (patch)
treed33ade7923e75b2166f891cf1cbbd2a2ef18c4b8 /src/core/SkPicture.cpp
parent594706566a62da1e00fa1bb678cc84c36464e811 (diff)
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>
Diffstat (limited to 'src/core/SkPicture.cpp')
-rw-r--r--src/core/SkPicture.cpp34
1 files changed, 4 insertions, 30 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;
- }
-}
-