Add SkEncodedInfo to report properties of encoded image data

src/codec/SkBmpCodec.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.
  */
 #ifndef SkBmpCodec_DEFINED
 #define SkBmpCodec_DEFINED
 
 #include "SkCodec.h"
@@ skipping 20 matching lines @@
     static SkCodec* NewFromStream(SkStream*);
 
     /*
      * Creates a bmp decoder for a bmp embedded in ico
      * Reads enough of the stream to determine the image format
      */
     static SkCodec* NewFromIco(SkStream*);
 
 protected:
 
-    SkBmpCodec(const SkImageInfo& info, SkStream* stream, uint16_t bitsPerPixel,
-            SkCodec::SkScanlineOrder rowOrder);
+    SkBmpCodec(int width, int height, const SkEncodedInfo& info, SkStream* stream,
+            uint16_t bitsPerPixel, SkCodec::SkScanlineOrder rowOrder);
 
     SkEncodedFormat onGetEncodedFormat() const override { return kBMP_SkEncodedFormat; }
 
     /*
      * Read enough of the stream to initialize the SkBmpCodec. Returns a bool
      * representing success or failure. If it returned true, and codecOut was
      * not nullptr, it will be set to a new SkBmpCodec.
      * Does *not* take ownership of the passed in SkStream.
      */
     static bool ReadHeader(SkStream*, bool inIco, SkCodec** codecOut);
@@ skipping 86 matching lines @@
     bool onSkipScanlines(int count) override;
 
     const uint16_t          fBitsPerPixel;
     const SkScanlineOrder   fRowOrder;
     const size_t            fSrcRowBytes;
 
     typedef SkCodec INHERITED;
 };
 
 #endif