| Index: src/codec/SkCodec_libpng.h | 
| diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h | 
| index c0fee74e96984d9001b92325e3163db5bbb3292d..a105c3c5e35659d3ee4ca3398108db7aa1ab21b2 100644 | 
| --- a/src/codec/SkCodec_libpng.h | 
| +++ b/src/codec/SkCodec_libpng.h | 
| @@ -44,17 +44,14 @@ | 
| SkSwizzler::SrcConfig       fSrcConfig; | 
| int                         fNumberPasses; | 
| bool                        fReallyHasAlpha; | 
| -    int                         fBitDepth; | 
|  | 
| -    SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop, int); | 
| +    SkPngCodec(const SkImageInfo&, SkStream*, png_structp, png_infop); | 
| ~SkPngCodec(); | 
| - | 
|  | 
| // Helper to set up swizzler and color table. Also calls png_read_update_info. | 
| Result initializeSwizzler(const SkImageInfo& requestedInfo, void* dst, | 
| size_t rowBytes, const Options&, SkPMColor*, int* ctableCount); | 
| - | 
| -    // Calls rewindIfNeeded and returns true if the decoder can continue. | 
| +    // Calls rewindIfNeeded, and returns true if the decoder can continue. | 
| bool handleRewind(); | 
| bool decodePalette(bool premultiply, int bitDepth, int* ctableCount); | 
| void finish(); | 
|  |