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
Review URL: https://codereview.chromium.org/1178013008
diff --git a/DEPS b/DEPS
index 318cf4e..bb44306 100644
--- a/DEPS
+++ b/DEPS
@@ -14,7 +14,7 @@
"third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35",
"third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@1afff032c83e26ddf7f2776e8b43de5ad666c1fa",
"third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@034e9a9747e0983bc19808ea70e469bc8342081f",
- "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39",
+ "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.4.3",
"third_party/externals/nanomsg" : "https://skia.googlesource.com/third_party/nanomsg.git@0.4-beta",
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4ba7cdd0e7bf49d671645264f839838fc56e1492",
# NOTE: If we update libpng, we may need to update the generated file at third_party/libpng/pnglibconf.h
diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp
index 70fffdd..fc6f46c 100644
--- a/gyp/libwebp.gyp
+++ b/gyp/libwebp.gyp
@@ -19,6 +19,9 @@
{
'target_name': 'libwebp_dec',
'type': 'static_library',
+ 'includes': [
+ 'libwebp_skia.gypi',
+ ],
'include_dirs': [
'../third_party/externals/libwebp',
],
@@ -28,7 +31,6 @@
'../third_party/externals/libwebp/src/dec/frame.c',
'../third_party/externals/libwebp/src/dec/idec.c',
'../third_party/externals/libwebp/src/dec/io.c',
- '../third_party/externals/libwebp/src/dec/layer.c',
'../third_party/externals/libwebp/src/dec/quant.c',
'../third_party/externals/libwebp/src/dec/tree.c',
'../third_party/externals/libwebp/src/dec/vp8.c',
@@ -41,6 +43,9 @@
{
'target_name': 'libwebp_demux',
'type': 'static_library',
+ 'includes': [
+ 'libwebp_skia.gypi',
+ ],
'include_dirs': [
'../third_party/externals/libwebp',
],
@@ -53,19 +58,27 @@
{
'target_name': 'libwebp_dsp',
'type': 'static_library',
+ 'includes': [
+ 'libwebp_skia.gypi',
+ ],
'include_dirs': [
'../third_party/externals/libwebp',
],
'sources': [
+ '../third_party/externals/libwebp/src/dsp/alpha_processing.c',
+ '../third_party/externals/libwebp/src/dsp/alpha_processing_sse2.c',
'../third_party/externals/libwebp/src/dsp/cpu.c',
'../third_party/externals/libwebp/src/dsp/dec.c',
+ '../third_party/externals/libwebp/src/dsp/dec_clip_tables.c',
'../third_party/externals/libwebp/src/dsp/dec_sse2.c',
'../third_party/externals/libwebp/src/dsp/enc.c',
'../third_party/externals/libwebp/src/dsp/enc_sse2.c',
'../third_party/externals/libwebp/src/dsp/lossless.c',
+ '../third_party/externals/libwebp/src/dsp/lossless_sse2.c',
'../third_party/externals/libwebp/src/dsp/upsampling.c',
'../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
'../third_party/externals/libwebp/src/dsp/yuv.c',
+ '../third_party/externals/libwebp/src/dsp/yuv_sse2.c',
],
'cflags': [ '-w' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
@@ -79,7 +92,13 @@
},
{
'target_name': 'libwebp_dsp_neon',
+ 'includes': [
+ 'libwebp_skia.gypi',
+ ],
'conditions': [
+ ['arm_version == 7', {
+ 'cflags': [ '-mfpu=neon' ],
+ }],
['arm_version >= 7', {
'type': 'static_library',
'include_dirs': [
@@ -88,13 +107,14 @@
'sources': [
'../third_party/externals/libwebp/src/dsp/dec_neon.c',
'../third_party/externals/libwebp/src/dsp/enc_neon.c',
+ '../third_party/externals/libwebp/src/dsp/lossless_neon.c',
'../third_party/externals/libwebp/src/dsp/upsampling_neon.c',
],
# behavior similar dsp_neon.c.neon in an Android.mk
'cflags!': [
'-mfpu=vfpv3-d16',
],
- 'cflags': [ '-mfpu=neon', '-w' ],
+ 'cflags': [ '-w' ],
},{ # !(arm_version >= 7)
'type': 'none',
}],
@@ -103,6 +123,9 @@
{
'target_name': 'libwebp_enc',
'type': 'static_library',
+ 'includes': [
+ 'libwebp_skia.gypi',
+ ],
'include_dirs': [
'../third_party/externals/libwebp',
],
@@ -116,8 +139,8 @@
'../third_party/externals/libwebp/src/enc/frame.c',
'../third_party/externals/libwebp/src/enc/histogram.c',
'../third_party/externals/libwebp/src/enc/iterator.c',
- '../third_party/externals/libwebp/src/enc/layer.c',
'../third_party/externals/libwebp/src/enc/picture.c',
+ '../third_party/externals/libwebp/src/enc/picture_csp.c',
'../third_party/externals/libwebp/src/enc/quant.c',
'../third_party/externals/libwebp/src/enc/syntax.c',
'../third_party/externals/libwebp/src/enc/token.c',
@@ -131,6 +154,9 @@
{
'target_name': 'libwebp_utils',
'type': 'static_library',
+ 'includes': [
+ 'libwebp_skia.gypi',
+ ],
'include_dirs': [
'../third_party/externals/libwebp',
],
@@ -143,6 +169,7 @@
'../third_party/externals/libwebp/src/utils/huffman_encode.c',
'../third_party/externals/libwebp/src/utils/quant_levels.c',
'../third_party/externals/libwebp/src/utils/quant_levels_dec.c',
+ '../third_party/externals/libwebp/src/utils/random.c',
'../third_party/externals/libwebp/src/utils/rescaler.c',
'../third_party/externals/libwebp/src/utils/thread.c',
'../third_party/externals/libwebp/src/utils/utils.c',
@@ -174,7 +201,7 @@
},
],
}, {
- # use_system_libwep == 1
+ # use_system_libwebp == 1
'targets': [
{
'target_name': 'libwebp',
diff --git a/gyp/libwebp_skia.gypi b/gyp/libwebp_skia.gypi
new file mode 100644
index 0000000..4c97505
--- /dev/null
+++ b/gyp/libwebp_skia.gypi
@@ -0,0 +1,16 @@
+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This allows us to build libwebp with a custom config.h file. It is currently
+# needed to work around skbug.com/4037, but perhaps we might have another need
+# for it in the future.
+{
+ 'include_dirs': [
+ '../third_party/libwebp/webp',
+ ],
+ 'defines': [
+ 'HAVE_CONFIG_H',
+ ],
+}
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index efa5880..94ae87f 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -119,7 +119,7 @@
ANDROID_ARCH="arm"
;;
arm64 | nexus_9)
- DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"
+ DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64 arm_version=8"
ANDROID_ARCH="arm64"
;;
x86)
diff --git a/resources/invalid_images/skbug3429.webp b/resources/invalid_images/skbug3429.webp
new file mode 100644
index 0000000..f9847e3
--- /dev/null
+++ b/resources/invalid_images/skbug3429.webp
Binary files differ
diff --git a/resources/invalid_images/skbug3442.webp b/resources/invalid_images/skbug3442.webp
new file mode 100644
index 0000000..747f04e
--- /dev/null
+++ b/resources/invalid_images/skbug3442.webp
Binary files differ
diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp
index 9543d4b..240de51 100644
--- a/tests/BadIcoTest.cpp
+++ b/tests/BadIcoTest.cpp
@@ -11,23 +11,25 @@
#include "SkImageDecoder.h"
#include "SkOSFile.h"
-DEF_TEST(BadIco, reporter) {
- const char* const badIcos [] = {
+DEF_TEST(BadImage, reporter) {
+ const char* const badImages [] = {
"sigabort_favicon.ico",
"sigsegv_favicon.ico",
"sigsegv_favicon_2.ico",
"ico_leak01.ico",
"ico_fuzz0.ico",
- "ico_fuzz1.ico"
+ "ico_fuzz1.ico",
+ "skbug3442.webp",
+ "skbug3429.webp",
};
- const char* badIcoFolder = "invalid_images";
+ const char* badImagesFolder = "invalid_images";
- SkString resourcePath = GetResourcePath(badIcoFolder);
+ SkString resourcePath = GetResourcePath(badImagesFolder);
SkBitmap bm;
- for (size_t i = 0; i < SK_ARRAY_COUNT(badIcos); ++i) {
- SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badIcos[i]);
+ for (size_t i = 0; i < SK_ARRAY_COUNT(badImages); ++i) {
+ SkString fullPath = SkOSPath::Join(resourcePath.c_str(), badImages[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.
diff --git a/third_party/libwebp/webp/config.h b/third_party/libwebp/webp/config.h
new file mode 100644
index 0000000..62ade94
--- /dev/null
+++ b/third_party/libwebp/webp/config.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Google, Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// FIXME: Workaround for skbug.com/4037
+// Some of our test machines have an older version of clang that does not
+// have
+// __builtin_bswap16
+//
+// But libwebp expects the builtin. We can change that by using this config.h
+// file, which replaces the checks in endian_inl.h to decide whether we have
+// particular builtins.
+
+#ifdef __builtin_bswap64(x)
+ #define HAVE_BUILTIN_BSWAP64
+#endif
+
+#ifdef __builtin_bswap32(x)
+ #define HAVE_BUILTIN_BSWAP32
+#endif
+
+#ifdef __builtin_bswap16(x)
+ #define HAVE_BUILTIN_BSWAP16
+#endif
