Revert of Add SkEncodedInfo to report properties of encoded image data

src/codec/SkBmpStandardCodec.h

Index: src/codec/SkBmpStandardCodec.h
diff --git a/src/codec/SkBmpStandardCodec.h b/src/codec/SkBmpStandardCodec.h
index b2b53df6c8e674e5e610732addc27e3e05f63ad3..557f6535c95fb882f2ccf02d7a14e06524931390 100644
--- a/src/codec/SkBmpStandardCodec.h
+++ b/src/codec/SkBmpStandardCodec.h
@@ -24,7 +24,7 @@
      * Called only by SkBmpCodec::NewFromStream
      * There should be no other callers despite this being public
      *
-     * @param info contains properties of the encoded data
+     * @param srcInfo contains the source width and height
      * @param stream the stream of encoded image data
      * @param bitsPerPixel the number of bits used to store each pixel
      * @param numColors the number of colors in the color table
@@ -37,7 +37,7 @@
      *                 the icp mask, if there is one)
      * @param inIco    indicates if the bmp is embedded in an ico file
      */
-    SkBmpStandardCodec(int width, int height, const SkEncodedInfo& info, SkStream* stream,
+    SkBmpStandardCodec(const SkImageInfo& srcInfo, SkStream* stream,
             uint16_t bitsPerPixel, uint32_t numColors, uint32_t bytesPerColor,
             uint32_t offset, SkCodec::SkScanlineOrder rowOrder, bool isOpaque,
             bool inIco);