Enabling ico decoding with use of png and bmp decoders

src/codec/SkCodec.cpp

Index: src/codec/SkCodec.cpp
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index 12341f59295fcec7e16c6fab0eea93f8cd78dba0..0411e44069e32cd15e7e218ac2100eb6649e6080 100644
--- a/src/codec/SkCodec.cpp
+++ b/src/codec/SkCodec.cpp
@@ -8,6 +8,7 @@
 #include "SkCodec.h"
 #include "SkData.h"
 #include "SkCodec_libbmp.h"
+#include "SkCodec_libico.h"
 #include "SkCodec_libpng.h"
 #include "SkStream.h"
 
@@ -18,6 +19,7 @@ struct DecoderProc {
 
 static const DecoderProc gDecoderProcs[] = {
     { SkPngCodec::IsPng, SkPngCodec::NewFromStream },
+    { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },

[scroggo, 2015/03/24 15:24:42]

nit: We should put these in order of frequency, so we attempt the most common
ones first.

I'm guessing BMP is more common than ICO, but that is a completely uneducated
guess, so I could certainly be wrong.

[msarett, 2015/03/24 16:55:07]

Will be changed to:
Png, JPEG, Gif, Bmp, Ico with a few other formats mixed in as well.

     { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }
 };