Enabling ico decoding with use of png and bmp decoders

include/codec/SkCodec.h

Index: include/codec/SkCodec.h
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index 6d0557cb28d22445c9dd9de1550e8a99eea97e6a..6ed951c2df641219f15aa0dd452a7031c18b4d03 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -50,6 +50,9 @@ public:
         return this->onGetScaledDimensions(desiredScale);
     }
 
+    // Helper for codecs
+    const SkImageInfo& getOriginalInfo() { return fInfo; }
+
 protected:
     SkCodec(const SkImageInfo&, SkStream*);
 
@@ -63,9 +66,6 @@ protected:
         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();