diff options
| author |  Mike Reed <reed@google.com> | 2017-07-26 17:40:53 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-26 22:10:10 +0000 |
| commit | 7f97f49a840c92e26058034c631e8d76a54897bd (patch) | |
| tree | 83fe30564c89699fa1a0107ca5c23c78e0ccbc96 /include/codec | |
| parent | 154e6dadea0db8c72de1fe1e23718e2b6933a660 (diff) | |
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 <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'include/codec')
| -rw-r--r-- | include/codec/SkAndroidCodec.h | 12 | ||||
| -rw-r--r-- | include/codec/SkCodec.h | 8 |
2 files changed, 0 insertions, 20 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(); /** |