Scanline decoding for bmp

src/codec/SkBmpMaskCodec.h

Index: src/codec/SkBmpMaskCodec.h
diff --git a/src/codec/SkBmpMaskCodec.h b/src/codec/SkBmpMaskCodec.h
index 6f43bb3f85ce23424892f05557fda750ebdda77e..e5fcf43807f6bf8c278ae72acf866459ca9d55c6 100644
--- a/src/codec/SkBmpMaskCodec.h
+++ b/src/codec/SkBmpMaskCodec.h
@@ -29,7 +29,8 @@ public:
      * @param rowOrder indicates whether rows are ordered top-down or bottom-up
      */
     SkBmpMaskCodec(const SkImageInfo& srcInfo, SkStream* stream,
-                   uint16_t bitsPerPixel, SkMasks* masks, RowOrder rowOrder);
+            SkBmpCodec::BmpInputFormat inputFormat, uint16_t bitsPerPixel,
+            SkMasks* masks, RowOrder rowOrder);
 
 protected:
 
@@ -41,8 +42,11 @@ private:
 
     bool initializeSwizzler(const SkImageInfo& dstInfo);
 
+    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);
+                  const Options& opts) override;
 
     SkAutoTDelete<SkMasks>              fMasks;        // owned
     SkAutoTDelete<SkMaskSwizzler>       fMaskSwizzler;