Scanline decoding for bmp

src/codec/SkBmpStandardCodec.h

Index: src/codec/SkBmpStandardCodec.h
diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h
index 45450e65918b95c5d5222ec36cb3ddba9f28edfa..48e8ddaf6903a0cf93207a750d041e4ff2941424 100644
--- a/src/codec/SkBmpStandardCodec.h
+++ b/src/codec/SkBmpStandardCodec.h
@@ -36,8 +36,9 @@ public:
      * @param rowOrder indicates whether rows are ordered top-down or bottom-up
      */
     SkBmpStandardCodec(const SkImageInfo& srcInfo, SkStream* stream,
-               uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor,
-               uint32_t offset, SkBmpCodec::RowOrder rowOrder, bool isIco);
+            SkBmpCodec::BmpInputFormat inputFormat, uint16_t bitsPerPixel,
+            uint32_t numColors, uint32_t bytesPerColor, uint32_t offset,
+            SkBmpCodec::RowOrder rowOrder, bool isIco);
 
 protected:
 
@@ -58,7 +59,11 @@ private:
 
     bool initializeSwizzler(const SkImageInfo& dstInfo, const Options& opts);
 
-    Result decode(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes, const Options& opts);
+    SkCodec::Result onStart(const SkImageInfo& dstInfo, const SkCodec::Options& options,
+                SkPMColor inputColorPtr[], int* inputColorCount) override;
+
+    Result decode(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+                  const Options& opts) override;
 
     SkAutoTUnref<SkColorTable>          fColorTable;     // owned
     const uint32_t                      fNumColors;