AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove dead code behind SK_SUPPORT_LEGACY_SERIALPROCS_REF

Browse Source 
Bug: skia:
Change-Id: Iba5ad1e8d5c74c79627cabbbbe4e835278553609
Reviewed-on: https://skia-review.googlesource.com/88820
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2017-12-21 16:27:20 -05:00 committed by Skia Commit-Bot
parent 847ac6a244
commit bdc453db78
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/core/SkPicture.h
View File

@ -90,14 +90,6 @@ public:
sk_sp<SkData> serialize(const SkSerialProcs* = nullptr) const;
void serialize(SkWStream*, const SkSerialProcs* = nullptr) const;
#ifdef SK_SUPPORT_LEGACY_SERIALPROCS_REF
sk_sp<SkData> serialize(const SkSerialProcs&) const;
static sk_sp<SkPicture> MakeFromStream(SkStream*, const SkDeserialProcs& procs);
static sk_sp<SkPicture> MakeFromData(const SkData* data, const SkDeserialProcs& procs);
static sk_sp<SkPicture> MakeFromData(sk_sp<SkData> data, const SkDeserialProcs& procs);
static sk_sp<SkPicture> MakeFromData(sk_sp<SkData>, const SkDeserialProcs* = nullptr);
#endif
/**
* Serialize to a buffer.
*/

20
src/core/SkPicture.cpp
View File

@ -243,26 +243,6 @@ sk_sp<SkData> SkPicture::serialize(const SkSerialProcs* procs) const {
return stream.detachAsData();
}
#ifdef SK_SUPPORT_LEGACY_SERIALPROCS_REF
sk_sp<SkData> SkPicture::serialize(const SkSerialProcs& procs) const {
return this->serialize(&procs);
}
sk_sp<SkPicture> SkPicture::MakeFromData(const SkData* data, const SkDeserialProcs& procs) {
return SkPicture::MakeFromData(data, &procs);
}
sk_sp<SkPicture> SkPicture::MakeFromData(sk_sp<SkData> data, const SkDeserialProcs& procs) {
return SkPicture::MakeFromData(std::move(data), &procs);
}
sk_sp<SkPicture> SkPicture::MakeFromStream(SkStream* stream, const SkDeserialProcs& procs) {
return SkPicture::MakeFromStream(stream, &procs);
}
sk_sp<SkPicture> SkPicture::MakeFromData(sk_sp<SkData> data, const SkDeserialProcs* procs) {
return SkPicture::MakeFromData(data.get(), procs);
}
#endif
static sk_sp<SkData> custom_serialize(const SkPicture* picture, const SkSerialProcs& procs) {
if (procs.fPictureProc) {
auto data = procs.fPictureProc(const_cast<SkPicture*>(picture), procs.fPictureCtx);