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; }

[msarett, 2015/03/18 19:53:22]

I made this public in order to check the dimensions of the embedded codec
(bmp-in-ico or png-in-ico).

The use case is that sometimes the dimensions of the embedded codec will not
match that of the ico codec, which can be a problem given that the memory
allocated for the destination is based on the ico codec.  This allows us to
correct the error in the ico dimensions and proceed with the decode.

[scroggo, 2015/03/18 21:39:18]

FWIW, I added this function because I didn't want to go through the trouble of
doing the following:

SkImageInfo info;
this->getInfo(&info);

Mike is working on changing getInfo to just return the info, like you'd
want/expect, and then you can just call that.

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