commit 15bfd075d38e4422a477e22940d06a137f66cc97
author msarett <msarett@google.com> Tue Mar 24 12:24:27 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Mar 24 12:24:27 2015 -0700
tree d3354771b661d48358071fac53b93e258dd9cf71
parent 46bffd6fbea7cc17c62cf469db145694cc650665

Enabling ico decoding with use of png and bmp decoders

BUG=skia:3257

Review URL: https://codereview.chromium.org/1011343003

src/codec/SkCodec.cpp

diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index 12341f5..0411e44 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 @@
 
 static const DecoderProc gDecoderProcs[] = {
     { SkPngCodec::IsPng, SkPngCodec::NewFromStream },
+    { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream },
     { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }
 };