diff options
-rw-r--r-- | include/codec/SkAndroidCodec.h | 12 | ||||
-rw-r--r-- | include/codec/SkCodec.h | 8 | ||||
-rw-r--r-- | src/codec/SkCodec.cpp | 9 |
3 files changed, 0 insertions, 29 deletions
diff --git a/include/codec/SkAndroidCodec.h b/include/codec/SkAndroidCodec.h index e785411ea9..3571108edd 100644 --- a/include/codec/SkAndroidCodec.h +++ b/include/codec/SkAndroidCodec.h @@ -41,18 +41,6 @@ public: */ static std::unique_ptr<SkAndroidCodec> MakeFromData(sk_sp<SkData>, SkPngChunkReader* = nullptr); -#ifdef SK_SUPPORT_LEGACY_CODEC_NEW - static SkAndroidCodec* NewFromStream(SkStream* stream, SkPngChunkReader* reader) { - return MakeFromStream(std::unique_ptr<SkStream>(stream), reader).release(); - } - static SkAndroidCodec* NewFromData(sk_sp<SkData> data, SkPngChunkReader* reader) { - return MakeFromData(std::move(data), reader).release(); - } - static SkAndroidCodec* NewFromData(SkData* data, SkPngChunkReader* reader) { - return NewFromData(sk_ref_sp(data), reader); - } -#endif - virtual ~SkAndroidCodec() {} diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index 1d6d904e28..fb4f165dbf 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -160,14 +160,6 @@ public: */ static std::unique_ptr<SkCodec> MakeFromData(sk_sp<SkData>, SkPngChunkReader* = nullptr); -#ifdef SK_SUPPORT_LEGACY_CODEC_NEW - static SkCodec* NewFromStream(SkStream* str, Result* res, SkPngChunkReader* chunk); - static SkCodec* NewFromData(sk_sp<SkData>, SkPngChunkReader* = nullptr); - static SkCodec* NewFromData(SkData* data, SkPngChunkReader* reader) { - return NewFromData(sk_ref_sp(data), reader); - } -#endif - virtual ~SkCodec(); /** diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp index 09343e2dff..2b6108250c 100644 --- a/src/codec/SkCodec.cpp +++ b/src/codec/SkCodec.cpp @@ -617,12 +617,3 @@ std::vector<SkCodec::FrameInfo> SkCodec::getFrameInfo() { } return result; } - -#ifdef SK_SUPPORT_LEGACY_CODEC_NEW -SkCodec* SkCodec::NewFromStream(SkStream* str, Result* res, SkPngChunkReader* chunk) { - return MakeFromStream(std::unique_ptr<SkStream>(str), res, chunk).release(); -} -SkCodec* SkCodec::NewFromData(sk_sp<SkData> data, SkPngChunkReader* chunk) { - return MakeFromData(std::move(data), chunk).release(); -} -#endif |