Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: include/codec/SkCodec.h

Issue 1123473004: remove dead code behind BOOL_ONGETINFO (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | include/core/SkImageGenerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/codec/SkCodec.h
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index b3898892b09c3ce3fcaec86b2f9d87465f61cff3..2e47a261f3924f2b018d988af56440f4310de2d3 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -111,25 +111,9 @@ public:
protected:
SkCodec(const SkImageInfo&, SkStream*);
- /**
- * The SkAlphaType is a conservative answer. i.e. it is possible that it
- * initially returns a non-opaque answer, but completing the decode
- * reveals that the image is actually opaque.
- */
-#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
- bool onGetInfo(SkImageInfo* info) override {
- *info = fInfo;
- return true;
- }
-#endif
-
virtual SkISize onGetScaledDimensions(float /* desiredScale */) const {
// By default, scaling is not supported.
-#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
- return fInfo.dimensions();
-#else
return this->getInfo().dimensions();
-#endif
}
virtual SkEncodedFormat onGetEncodedFormat() const = 0;
@@ -194,9 +178,6 @@ protected:
}
private:
-#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
- const SkImageInfo fInfo;
-#endif // SK_SUPPORT_LEGACY_BOOL_ONGETINFO
SkAutoTDelete<SkStream> fStream;
bool fNeedsRewind;
SkAutoTDelete<SkScanlineDecoder> fScanlineDecoder;
« no previous file with comments | « no previous file | include/core/SkImageGenerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698