| commit | 97ff7f56620a50e83e433b158a86ff082935ed47 | [log] [tgz] |
|---|---|---|
| author | scroggo <scroggo@google.com> | Fri Dec 04 07:09:57 2015 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Fri Dec 04 07:09:57 2015 -0800 |
| tree | 375c0c60b9bc2e19195c75d25c08be487904c42d | |
| parent | 41cbf3f807d619861365112513655f5f00e16005 [diff] [blame] |
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
diff --git a/src/codec/SkAndroidCodec.cpp b/src/codec/SkAndroidCodec.cpp index c26b3ef..cf6e253 100644 --- a/src/codec/SkAndroidCodec.cpp +++ b/src/codec/SkAndroidCodec.cpp
@@ -34,9 +34,11 @@ 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; } }