Allow SkAndroidCodec to use SkPngChunkReader

include/codec/SkAndroidCodec.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 SkAndroidCodec_DEFINED
 #define SkAndroidCodec_DEFINED
 
 #include "SkCodec.h"
 #include "SkEncodedFormat.h"
 #include "SkStream.h"
 #include "SkTypes.h"
 
 /**
  *  Abstract interface defining image codec functionality that is necessary for
  *  Android.
  */
 class SkAndroidCodec : SkNoncopyable {
 public:
     /**
      *  If this stream represents an encoded image that we know how to decode,
      *  return an SkAndroidCodec that can decode it. Otherwise return NULL.
      *
+     *  The SkPngChunkReader handles unknown chunks in PNGs.
+     *  See SkCodec.h for more details.
+     *
      *  If NULL is returned, the stream is deleted immediately. Otherwise, the
      *  SkCodec takes ownership of it, and will delete it when done with it.
      */
-    static SkAndroidCodec* NewFromStream(SkStream*);
+    static SkAndroidCodec* NewFromStream(SkStream*, SkPngChunkReader* = NULL);
 
     /**
      *  If this data represents an encoded image that we know how to decode,
      *  return an SkAndroidCodec that can decode it. Otherwise return NULL.
      *
+     *  The SkPngChunkReader handles unknown chunks in PNGs.
+     *  See SkCodec.h for more details.
+     *
      *  Will take a ref if it returns a codec, else will not affect the data.
      */
-    static SkAndroidCodec* NewFromData(SkData*);
+    static SkAndroidCodec* NewFromData(SkData*, SkPngChunkReader* = NULL);
 
     virtual ~SkAndroidCodec() {}
 
 
     const SkImageInfo& getInfo() const { return fInfo; }
 
     /**
      *  Format of the encoded data.
      */
     SkEncodedFormat getEncodedFormat() const { return this->onGetEncodedFormat(); }
@@ skipping 167 matching lines @@
     virtual SkCodec::Result onGetAndroidPixels(const SkImageInfo& info, void* pixels,
             size_t rowBytes, const AndroidOptions& options) = 0;
 
 private:
 
     // This will always be a reference to the info that is contained by the
     // embedded SkCodec.
     const SkImageInfo& fInfo;
 };
 #endif // SkAndroidCodec_DEFINED