Enabling ico decoding with use of png and bmp decoders

include/codec/SkCodec.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 SkCodec_DEFINED
 #define SkCodec_DEFINED
 
@@ skipping 32 matching lines @@
      *  Return a size that approximately supports the desired scale factor.
      *  The codec may not be able to scale efficiently to the exact scale
      *  factor requested, so return a size that approximates that scale.
      *
      *  FIXME: Move to SkImageGenerator?
      */
     SkISize getScaledDimensions(float desiredScale) const {
         return this->onGetScaledDimensions(desiredScale);
     }
 
+    // Helper for codecs
+    const SkImageInfo& getOriginalInfo() { return fInfo; }
+
 protected:
     SkCodec(const SkImageInfo&, SkStream*);
 
     /**
      *  The SkAlphaType is a conservative answer. i.e. it is possible that it
      *  initially returns a non-opaque answer, but completing the decode
      *  reveals that the image is actually opaque.
      */
     bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {
         *info = fInfo;
         return true;
     }
 
-    // Helper for subclasses.
-    const SkImageInfo& getOriginalInfo() { return fInfo; }
-
     virtual SkISize onGetScaledDimensions(float /* desiredScale */) const {
         // By default, scaling is not supported.
         return fInfo.dimensions();
     }
 
     /**
      *  If the stream was previously read, attempt to rewind.
      *  @returns:
      *      true
      *       - if the stream needed to be rewound, and the rewind
@@ skipping 15 matching lines @@
     SkStream* stream() {
         return fStream.get();
     }
 
 private:
     const SkImageInfo       fInfo;
     SkAutoTDelete<SkStream> fStream;
     bool                    fNeedsRewind;
 };
 #endif // SkCodec_DEFINED