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

Unified Diff: src/codec/SkCodec_libpng.h

Issue 1557403002: Delete reallyHasAlpha() from SkCodec (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 4 years, 11 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 | « src/codec/SkCodecPriv.h ('k') | src/codec/SkCodec_libpng.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/codec/SkCodec_libpng.h
diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h
index 78f1c5de53ef8fa5813a55bfedbf6cd7eeba05b3..9a13a1267018e749ebe9be51f95cdae233eeb016 100644
--- a/src/codec/SkCodec_libpng.h
+++ b/src/codec/SkCodec_libpng.h
@@ -32,7 +32,6 @@ protected:
SkEncodedFormat onGetEncodedFormat() const override { return kPNG_SkEncodedFormat; }
bool onRewind() override;
uint32_t onGetFillValue(SkColorType colorType, SkAlphaType alphaType) const override;
- bool onReallyHasAlpha() const final;
// Helper to set up swizzler and color table. Also calls png_read_update_info.
Result initializeSwizzler(const SkImageInfo& requestedInfo, const Options&,
@@ -49,19 +48,6 @@ protected:
SkSwizzler::SrcConfig srcConfig() const { return fSrcConfig; }
int numberPasses() const { return fNumberPasses; }
- enum AlphaState {
- // This class has done no decoding, or threw away its knowledge (in
- // scanline decodes).
- kUnknown_AlphaState,
- // This class found the image (possibly partial, in the case of a
- // scanline decode) to be opaque.
- kOpaque_AlphaState,
- // Ths class found the image to have alpha.
- kHasAlpha_AlphaState,
- };
-
- virtual AlphaState alphaInScanlineDecode() const = 0;
-
private:
SkAutoTUnref<SkPngChunkReader> fPngChunkReader;
png_structp fPng_ptr;
@@ -74,7 +60,6 @@ private:
SkSwizzler::SrcConfig fSrcConfig;
const int fNumberPasses;
int fBitDepth;
- AlphaState fAlphaState;
bool decodePalette(bool premultiply, int* ctableCount);
void destroyReadStruct();
« no previous file with comments | « src/codec/SkCodecPriv.h ('k') | src/codec/SkCodec_libpng.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698