Revert of Make SkAndroidCodec support ico (patchset #7 id:130002 of https://codereview.chromium.org/1472933002/ )

Reason for revert:
Crashing: https://uberchromegw.corp.google.com/i/client.skia.android/builders/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release/builds/1499/steps/dm/logs/stdio

Also, related ASAN failures:
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN/builds/3676/steps/dm/logs/stdio

Original issue's description:
> Make SkAndroidCodec support ico
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/1603e9310f62cf0dd543cdb09dea06aa78373f13

TBR=djsollen@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

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

1 files changed, 20 insertions, 2 deletions

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 41e4c8dc3e..c28f688697 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -345,17 +345,35 @@ static void push_codec_srcs(Path path) {
     bool subset = false;
     // The following image types are supported by BitmapRegionDecoder,
     // so we will test full image decodes and subset decodes.
-    static const char* const exts[] = {
+    static const char* const subsetExts[] = {
         "jpg", "jpeg", "png", "webp",
         "JPG", "JPEG", "PNG", "WEBP",
     };
-    for (const char* ext : exts) {
+    for (const char* ext : subsetExts) {
         if (path.endsWith(ext)) {
             subset = true;
             break;
         }
     }
 
+    bool full = false;
+    // The following image types are only supported by BitmapFactory,
+    // so we only need to test full image decodes.
+    static const char* fullExts[] = {
+        "wbmp", "bmp", "gif",
+        "WBMP", "BMP", "GIF",
+    };
+    for (const char* ext : fullExts) {
+        if (path.endsWith(ext)) {
+            full = true;
+            break;
+        }
+    }
+
+    if (!full && !subset) {
+        return;
+    }
+
     const int sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
 
     for (int sampleSize : sampleSizes) {