diff options
author | scroggo <scroggo@google.com> | 2015-12-04 07:09:57 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-04 07:09:57 -0800 |
commit | 97ff7f56620a50e83e433b158a86ff082935ed47 (patch) | |
tree | 375c0c60b9bc2e19195c75d25c08be487904c42d /tests | |
parent | 41cbf3f807d619861365112513655f5f00e16005 (diff) |
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
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CodexTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp index 03dd16f583..697ba749f7 100644 --- a/tests/CodexTest.cpp +++ b/tests/CodexTest.cpp @@ -401,9 +401,9 @@ DEF_TEST(Codec, r) { // FIXME: We are not ready to test incomplete ICOs // These two tests examine interestingly different behavior: // Decodes an embedded BMP image - check(r, "color_wheel.ico", SkISize::Make(128, 128), true, false, false); + check(r, "color_wheel.ico", SkISize::Make(128, 128), false, false, false); // Decodes an embedded PNG image - check(r, "google_chrome.ico", SkISize::Make(256, 256), true, false, false); + check(r, "google_chrome.ico", SkISize::Make(256, 256), false, false, false); // GIF // FIXME: We are not ready to test incomplete GIFs |