Allow SkAndroidCodec to use SkPngChunkReader

src/codec/SkAndroidCodec.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 "SkAndroidCodec.h"
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
 #include "SkSampledCodec.h"
 #include "SkWebpAdapterCodec.h"
 
 static bool is_valid_sample_size(int sampleSize) {
     // FIXME: As Leon has mentioned elsewhere, surely there is also a maximum sampleSize?
     return sampleSize > 0;
 }
 
 SkAndroidCodec::SkAndroidCodec(const SkImageInfo& info)
     : fInfo(info)
 {}
 
-SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream) {
-    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream));
+SkAndroidCodec* SkAndroidCodec::NewFromStream(SkStream* stream, SkPngChunkReader* chunkReader) {
+    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream, chunkReader));
     if (nullptr == codec) {
         return nullptr;
     }
 
     switch (codec->getEncodedFormat()) {
         case kWEBP_SkEncodedFormat:
             return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach());
         case kPNG_SkEncodedFormat:
         case kJPEG_SkEncodedFormat:
         case kWBMP_SkEncodedFormat:
         case kBMP_SkEncodedFormat:
         case kGIF_SkEncodedFormat:
             return new SkSampledCodec(codec.detach());
         default:
             // FIXME: SkSampledCodec is temporarily disabled for other formats
             // while focusing on the formats that are supported by
             // BitmapRegionDecoder.
             return nullptr;
     }
 }
 
-SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data) {
+SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chunkReader) {
     if (!data) {
         return nullptr;
     }
 
-    return NewFromStream(new SkMemoryStream(data));
+    return NewFromStream(new SkMemoryStream(data), chunkReader);
 }
 
 SkISize SkAndroidCodec::getSampledDimensions(int sampleSize) const {
     if (!is_valid_sample_size(sampleSize)) {
         return SkISize::Make(0, 0);
     }
 
     // Fast path for when we are not scaling.
     if (1 == sampleSize) {
         return fInfo.dimensions();
@@ skipping 61 matching lines @@
         }
     }
 
     return this->onGetAndroidPixels(info, pixels, rowBytes, *options);
 }
 
 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
         size_t rowBytes) {
     return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
 }