c1d1dd738e
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
37 lines
1.0 KiB
C++
37 lines
1.0 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Resources.h"
|
|
#include "Test.h"
|
|
#include "SkBitmap.h"
|
|
#include "SkImageDecoder.h"
|
|
#include "SkOSFile.h"
|
|
|
|
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"
|
|
};
|
|
|
|
const char* badIcoFolder = "invalid_images";
|
|
|
|
SkString resourcePath = GetResourcePath(badIcoFolder);
|
|
|
|
SkBitmap bm;
|
|
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.
|
|
REPORTER_ASSERT(reporter, !success);
|
|
}
|
|
}
|