commit 1603e9310f62cf0dd543cdb09dea06aa78373f13
author msarett <msarett@google.com> Fri Dec 04 05:43:09 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Dec 04 05:43:09 2015 -0800
tree 5ef44b26dbdec877f35834a79c0e6408e7518d9e
parent bbf2ce4b06bce1d5b70529b2fe08c159c1a93704

Make SkAndroidCodec support ico

BUG=skia:

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

src/codec/SkAndroidCodec.cpp

diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp
index cf6e253..c26b3ef 100644
--- a/src/codec/SkAndroidCodec.cpp
+++ b/src/codec/SkAndroidCodec.cpp
@@ -34,11 +34,9 @@
         case kWBMP_SkEncodedFormat:
         case kBMP_SkEncodedFormat:
         case kGIF_SkEncodedFormat:
+        case kICO_SkEncodedFormat:
             return new SkSampledCodec(codec.detach());
         default:
-            // FIXME: SkSampledCodec is temporarily disabled for other formats
-            // while focusing on the formats that are supported by
-            // BitmapRegionDecoder.
             return nullptr;
     }
 }