Make SkAndroidCodec support ico

src/codec/SkAndroidCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAndroidCodec.h"
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
@@ skipping 16 matching lines @@
     }
 
     switch (codec->getEncodedFormat()) {
         case kWEBP_SkEncodedFormat:
             return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach());
         case kPNG_SkEncodedFormat:
         case kJPEG_SkEncodedFormat:
         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;
     }
 }
 
 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data) {
     if (!data) {
         return nullptr;
     }
 
     return NewFromStream(new SkMemoryStream(data));
@@ skipping 71 matching lines @@
         }
     }
 
     return this->onGetAndroidPixels(info, pixels, rowBytes, *options);
 }
 
 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
         size_t rowBytes) {
     return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
 }