Add SkEncodedInfo to report properties of encoded image data

src/codec/SkCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBmpCodec.h"
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
@@ skipping 96 matching lines @@
     return nullptr;
 }
 
 SkCodec* SkCodec::NewFromData(SkData* data, SkPngChunkReader* reader) {
     if (!data) {
         return nullptr;
     }
     return NewFromStream(new SkMemoryStream(data), reader);
 }
 
-SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream, sk_sp<SkColorSpace> colorSpace,
-        Origin origin)
-    : fSrcInfo(info)
+SkCodec::SkCodec(int width, int height, const SkEncodedInfo& info, SkStream* stream,
+        sk_sp<SkColorSpace> colorSpace, Origin origin)
+    : fEncodedInfo(info)
+    , fSrcInfo(info.makeImageInfo(width, height))
     , fStream(stream)
     , fNeedsRewind(false)
     , fColorSpace(colorSpace)
     , fOrigin(origin)
     , fDstInfo()
     , fOptions()
     , fCurrScanline(-1)
 {}
 
 SkCodec::~SkCodec() {}
@@ skipping 251 matching lines @@
             SkASSERT(1 == linesRequested || this->getInfo().height() == linesRequested);
             const SkImageInfo fillInfo = info.makeWH(fillWidth, 1);
             for (int srcY = linesDecoded; srcY < linesRequested; srcY++) {
                 fillDst = SkTAddOffset<void>(dst, this->outputScanline(srcY) * rowBytes);
                 fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, sampler);
             }
             break;
         }
     }
 }