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..275a800d9c324283c912a192830a1fc74fa213a7 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() const { return fInfo; }

[scroggo, 2015/03/23 13:41:24]

Can you always use getInfo(), so this is never needed? I think Mike added a
version which returns an SkImageInfo. (The only reason I had this to begin with
was to simplify the call of:

SkImageInfo info;
codec->getInfo(&info);
info.dimensions(); // (or whatever)

to

codec->getInfo().dimensions()

[msarett, 2015/03/23 19:40:02]

Done.

+
 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();