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..58b2e6b5079e0eefe7d3f70e2fdfadbdb1f0615d 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);
+            uint16_t bitsPerPixel, SkMasks* masks,
+            SkScanlineDecoder::SkScanlineOrder rowOrder);
 
 protected:
 
@@ -37,15 +38,20 @@ protected:
                        size_t dstRowBytes, const Options&, SkPMColor*,
                        int*) override;
 
+    SkCodec::Result prepareToDecode(const SkImageInfo& dstInfo,
+            const SkCodec::Options& options, SkPMColor inputColorPtr[],
+            int* inputColorCount) override;
+
 private:
 
     bool initializeSwizzler(const SkImageInfo& dstInfo);
 
-    Result decode(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
-                  const Options& opts);
+    Result decodeRows(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes,
+                      const Options& opts) override;
 
     SkAutoTDelete<SkMasks>              fMasks;        // owned
     SkAutoTDelete<SkMaskSwizzler>       fMaskSwizzler;
+    const size_t                        fSrcRowBytes;
     SkAutoTDeleteArray<uint8_t>         fSrcBuffer;
 
     typedef SkBmpCodec INHERITED;