From f01610effccd3fba2be5cec5dc10fbf9af5744a0 Mon Sep 17 00:00:00 2001 From: scroggo Date: Tue, 8 Dec 2015 18:48:38 -0800 Subject: Remove staging for SkImageDecoder::Peeker Will no longer be needed once ag/817367 lands - Android will be inheriting directly from SkPngChunkReader, so no need for the intermediate. BUG=skia:4574 Review URL: https://codereview.chromium.org/1470913004 --- include/core/SkImageDecoder.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'include/core/SkImageDecoder.h') diff --git a/include/core/SkImageDecoder.h b/include/core/SkImageDecoder.h index 30323b59ee..5060a1e599 100644 --- a/include/core/SkImageDecoder.h +++ b/include/core/SkImageDecoder.h @@ -16,8 +16,6 @@ #include "SkTRegistry.h" #include "SkTypes.h" -//#define SK_LEGACY_PEEKER - class SkStream; class SkStreamRewindable; @@ -129,18 +127,6 @@ public: */ bool getRequireUnpremultipliedColors() const { return fRequireUnpremultipliedColors; } -#ifdef SK_LEGACY_PEEKER - // Android subclasses SkImageDecoder::Peeker, which has been changed into SkPngChunkReader. - // Temporarily use this class until Android can be updated to directly inherit from - // SkPngChunkReader. - class Peeker : public SkPngChunkReader { - public: - bool readChunk(const char tag[], const void* data, size_t length) final { - return this->peek(tag, data, length); - } - virtual bool peek(const char tag[], const void* data, size_t length) = 0; - }; -#endif SkPngChunkReader* getPeeker() const { return fPeeker; } SkPngChunkReader* setPeeker(SkPngChunkReader*); -- cgit v1.2.3