From 7f97f49a840c92e26058034c631e8d76a54897bd Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 26 Jul 2017 17:40:53 -0400 Subject: remove SK_SUPPORT_LEGACY_CODEC_NEW dead code Bug: skia: Change-Id: I59185b8acc00b6df854c613ba29d1002111fcb42 Reviewed-on: https://skia-review.googlesource.com/27240 Commit-Queue: Mike Klein Reviewed-by: Mike Klein --- include/codec/SkAndroidCodec.h | 12 ------------ include/codec/SkCodec.h | 8 -------- 2 files changed, 20 deletions(-) (limited to 'include/codec') 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 MakeFromData(sk_sp, SkPngChunkReader* = nullptr); -#ifdef SK_SUPPORT_LEGACY_CODEC_NEW - static SkAndroidCodec* NewFromStream(SkStream* stream, SkPngChunkReader* reader) { - return MakeFromStream(std::unique_ptr(stream), reader).release(); - } - static SkAndroidCodec* NewFromData(sk_sp 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 MakeFromData(sk_sp, SkPngChunkReader* = nullptr); -#ifdef SK_SUPPORT_LEGACY_CODEC_NEW - static SkCodec* NewFromStream(SkStream* str, Result* res, SkPngChunkReader* chunk); - static SkCodec* NewFromData(sk_sp, SkPngChunkReader* = nullptr); - static SkCodec* NewFromData(SkData* data, SkPngChunkReader* reader) { - return NewFromData(sk_ref_sp(data), reader); - } -#endif - virtual ~SkCodec(); /** -- cgit v1.2.3