aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkImageDecoder.h
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2015-12-08 18:48:38 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-12-08 18:48:38 -0800
commitf01610effccd3fba2be5cec5dc10fbf9af5744a0 (patch)
tree13ad3ae672381749c20137e5d567b25405487236 /include/core/SkImageDecoder.h
parentbb5b77db51d2e149ee66db284903572a5aac09be (diff)
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
Diffstat (limited to 'include/core/SkImageDecoder.h')
-rw-r--r--include/core/SkImageDecoder.h14
1 files changed, 0 insertions, 14 deletions
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*);