Refactor SkBmpCodec

src/codec/SkBmpStandardCodec.cpp

 /*
  * 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 "SkBmpStandardCodec.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 210 matching lines @@
             return y;
         }
 
         // Decode the row in destination format
         uint32_t row = this->getDstRow(y, dstInfo.height());
 
         void* dstRow = SkTAddOffset<void>(dst, row * dstRowBytes);
         fSwizzler->swizzle(dstRow, fSrcBuffer.get());
     }
 
-    if (fInIco) {
+    if (fInIco && fIsOpaque) {

[msarett, 2016/03/22 13:49:04]

There shouldn't be a transparency mask if the BMP itself was non-opaque (I
think).

         const int startScanline = this->currScanline();
         if (startScanline < 0) {
             // We are not performing a scanline decode.
             // Just decode the entire ICO mask and return.
             decodeIcoMask(this->stream(), dstInfo, dst, dstRowBytes);
             return height;
         }
 
         // In order to perform a scanline ICO decode, we must be able
         // to skip ahead in the stream in order to apply the AND mask
@@ skipping 77 matching lines @@
     }
 }
 
 uint32_t SkBmpStandardCodec::onGetFillValue(SkColorType colorType) const {
     const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
     if (colorPtr) {
         return get_color_table_fill_value(colorType, colorPtr, 0);
     }
     return INHERITED::onGetFillValue(colorType);
 }