Support more color types for ICOs

src/codec/SkBmpStandardCodec.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBmpCodec.h"
 #include "SkColorTable.h"
 #include "SkImageInfo.h"
 #include "SkSwizzler.h"
 #include "SkTypes.h"
 
 /*
  * This class implements the decoding for bmp images that use "standard" modes,
  * which essentially means they do not contain bit masks or RLE codes.
  */
 class SkBmpStandardCodec : public SkBmpCodec {
 public:
 
     /*
      * Creates an instance of the decoder
      *
      * Called only by SkBmpCodec::NewFromStream
      * There should be no other callers despite this being public
      *
      * @param srcInfo contains the source width and height
      * @param stream the stream of encoded image data
      * @param bitsPerPixel the number of bits used to store each pixel
-     * @param format the format of the bmp file
      * @param numColors the number of colors in the color table
      * @param bytesPerColor the number of bytes in the stream used to represent
                             each color in the color table
      * @param offset the offset of the image pixel data from the end of the
      *               headers
      * @param rowOrder indicates whether rows are ordered top-down or bottom-up
+     * @param isOpaque indicates if the bmp itself is opaque (before applying
+     *                 the icp mask, if there is one)
+     * @param inIco    indicates if the bmp is embedded in an ico file
      */
     SkBmpStandardCodec(const SkImageInfo& srcInfo, SkStream* stream,
             uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor,
-            uint32_t offset, SkCodec::SkScanlineOrder rowOrder,
-            bool isIco);
+            uint32_t offset, SkCodec::SkScanlineOrder rowOrder, bool isOpaque,
+            bool inIco);
 
 protected:
 
     Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
                        size_t dstRowBytes, const Options&, SkPMColor*,
                        int*, int*) override;
 
     bool onInIco() const override {
         return fInIco;
     }
@@ skipping 31 matching lines @@
     void decodeIcoMask(SkStream* stream, const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes);
 
     SkAutoTUnref<SkColorTable>          fColorTable;     // owned
     // fNumColors is the number specified in the header, or 0 if not present in the header.
     const uint32_t                      fNumColors;
     const uint32_t                      fBytesPerColor;
     const uint32_t                      fOffset;
     SkAutoTDelete<SkSwizzler>           fSwizzler;
     const size_t                        fSrcRowBytes;
     SkAutoTDeleteArray<uint8_t>         fSrcBuffer;
+    const bool                          fIsOpaque;
     const bool                          fInIco;
     const size_t                        fAndMaskRowBytes; // only used for fInIco decodes
 
     typedef SkBmpCodec INHERITED;
 };