diff options
| author |  scroggo <scroggo@google.com> | 2015-07-08 10:57:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-08 10:57:22 -0700 |
| commit | c1d1dd738e8dda1dd439f8e2b065ec73b5c12b51 (patch) | |
| tree | 185881702ff5890365721bc7b52b1d81d69f41a9 /tests/BadIcoTest.cpp | |
| parent | 5f0b0ad5d9c6d3345ccb5ae902a006e85c10e19b (diff) | |
Revert of Use the upstream version of libwebp, v0.4.3. (patchset #6 id:70001 of https://codereview.chromium.org/1178013008/)
Reason for revert:
Breaking the build e.g. http://build.chromium.org/p/client.skia/builders/Perf-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release/builds/1082/steps/build%20nanobench/logs/stdio
../../../third_party/externals/libwebp/src/utils/./endian_inl.h:51:10: error: use of unknown builtin '__builtin_bswap16' [-Wimplicit-function-declaration]
return __builtin_bswap16(x);
^
1 error generated.
Original issue's description:
> Use the upstream version of libwebp, v0.4.3.
>
> DEPS:
> Update to pull v0.4.3 of libwebp from upstream
>
> gyp/libwebp.gyp:
> Add new files, as referenced by the gyp file used by Chromium.
>
> resource/tests:
> Add regression tests for particular images.
>
> BUG=skia:3442
> BUG=skia:3315
> BUG=skia:3429
>
> Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1
TBR=djsollen@google.com,jzern@chromium.org,msarett@google.com,emmaleer@google.com,scroggo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3442
Review URL: https://codereview.chromium.org/1223583004
Diffstat (limited to 'tests/BadIcoTest.cpp')
| -rw-r--r-- | tests/BadIcoTest.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp index 240de514c9..9543d4b2f5 100644 --- a/tests/BadIcoTest.cpp +++ b/tests/BadIcoTest.cpp @@ -11,25 +11,23 @@ #include "SkImageDecoder.h" #include "SkOSFile.h" -DEF_TEST(BadImage, reporter) { - const char* const badImages [] = { +DEF_TEST(BadIco, reporter) { + const char* const badIcos [] = { "sigabort_favicon.ico", "sigsegv_favicon.ico", "sigsegv_favicon_2.ico", "ico_leak01.ico", "ico_fuzz0.ico", - "ico_fuzz1.ico", - "skbug3442.webp", - "skbug3429.webp", + "ico_fuzz1.ico" }; - const char* badImagesFolder = "invalid_images"; + const char* badIcoFolder = "invalid_images"; - SkString resourcePath = GetResourcePath(badImagesFolder); + SkString resourcePath = GetResourcePath(badIcoFolder); SkBitmap bm; - for (size_t i = 0; i < SK_ARRAY_COUNT(badImages); ++i) { - SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badImages[i]); + for (size_t i = 0; i < SK_ARRAY_COUNT(badIcos); ++i) { + SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badIcos[i]); bool success = SkImageDecoder::DecodeFile(fullPath.c_str(), &bm); // These files are invalid, and should not decode. More importantly, // though, we reached here without crashing. |