commit 0be01ccecba9c330baf4ba3840e57f34f6cdf320
author Kevin Lubick <kjlubick@google.com> Wed Feb 14 13:09:25 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 14 19:00:27 2018 +0000
tree d77a4480b690810878caace28c12f18f4309a0aa
parent 3b94c06eb6c5c08aea4c0db51951751330abbcc6

Roll libwebp to 0.6.1

Bug: oss-fuzz:6299
Change-Id: I2e87368e04ff37db7e431fd1960f0bf91440037f
Reviewed-on: https://skia-review.googlesource.com/107281
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

DEPS

diff --git a/DEPS b/DEPS
index 7d9c245..c6f0cb8 100644
--- a/DEPS
+++ b/DEPS
@@ -14,7 +14,7 @@
   "third_party/externals/jsoncpp"       : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0",
   "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git@1.5.3",
   "third_party/externals/libpng"        : "https://skia.googlesource.com/third_party/libpng.git@v1.6.33",
-  "third_party/externals/libwebp"       : "https://chromium.googlesource.com/webm/libwebp.git@v0.6.0",
+  "third_party/externals/libwebp"       : "https://chromium.googlesource.com/webm/libwebp.git@v0.6.1",
   "third_party/externals/lua"           : "https://skia.googlesource.com/external/github.com/lua/lua.git@v5-3-4",
   "third_party/externals/microhttpd"    : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",
   "third_party/externals/piex"          : "https://android.googlesource.com/platform/external/piex.git@8f540f64b6c170a16fb7e6e52d61819705c1522a",

third_party/libwebp/BUILD.gn

diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn
index 46acfc8..e42e36c 100644
--- a/third_party/libwebp/BUILD.gn
+++ b/third_party/libwebp/BUILD.gn
@@ -29,7 +29,10 @@
   }
 
   third_party("libwebp_sse41") {
-    public_include_dirs = [ "../externals/libwebp/src" ]
+    public_include_dirs = [
+      "../externals/libwebp/src",
+      "../externals/libwebp",
+    ]
     configs += [ ":libwebp_defines" ]
     sources = [
       "../externals/libwebp/src/dsp/alpha_processing_sse41.c",
@@ -44,7 +47,10 @@
   }
 
   third_party("libwebp_avx2") {
-    public_include_dirs = [ "../externals/libwebp/src" ]
+    public_include_dirs = [
+      "../externals/libwebp/src",
+      "../externals/libwebp",
+    ]
     configs += [ ":libwebp_defines" ]
     sources = [
       "../externals/libwebp/src/dsp/enc_avx2.c",
@@ -56,7 +62,10 @@
   }
 
   third_party("libwebp") {
-    public_include_dirs = [ "../externals/libwebp/src" ]
+    public_include_dirs = [
+      "../externals/libwebp/src",
+      "../externals/libwebp",
+    ]
 
     deps = [
       ":libwebp_avx2",
@@ -78,14 +87,12 @@
       "../externals/libwebp/src/dec/vp8_dec.c",
       "../externals/libwebp/src/dec/vp8l_dec.c",
       "../externals/libwebp/src/dec/webp_dec.c",
+      "../externals/libwebp/src/demux/anim_decode.c",
       "../externals/libwebp/src/demux/demux.c",
       "../externals/libwebp/src/dsp/alpha_processing.c",
       "../externals/libwebp/src/dsp/alpha_processing_mips_dsp_r2.c",
       "../externals/libwebp/src/dsp/alpha_processing_neon.c",
       "../externals/libwebp/src/dsp/alpha_processing_sse2.c",
-      "../externals/libwebp/src/dsp/argb.c",
-      "../externals/libwebp/src/dsp/argb_mips_dsp_r2.c",
-      "../externals/libwebp/src/dsp/argb_sse2.c",
       "../externals/libwebp/src/dsp/cost.c",
       "../externals/libwebp/src/dsp/cost_mips32.c",
       "../externals/libwebp/src/dsp/cost_mips_dsp_r2.c",
@@ -95,6 +102,7 @@
       "../externals/libwebp/src/dsp/dec_clip_tables.c",
       "../externals/libwebp/src/dsp/dec_mips32.c",
       "../externals/libwebp/src/dsp/dec_mips_dsp_r2.c",
+      "../externals/libwebp/src/dsp/dec_msa.c",
       "../externals/libwebp/src/dsp/dec_neon.c",
       "../externals/libwebp/src/dsp/dec_sse2.c",
       "../externals/libwebp/src/dsp/enc.c",
@@ -125,6 +133,8 @@
       "../externals/libwebp/src/dsp/rescaler_msa.c",
       "../externals/libwebp/src/dsp/rescaler_neon.c",
       "../externals/libwebp/src/dsp/rescaler_sse2.c",
+      "../externals/libwebp/src/dsp/ssim.c",
+      "../externals/libwebp/src/dsp/ssim_sse2.c",
       "../externals/libwebp/src/dsp/upsampling.c",
       "../externals/libwebp/src/dsp/upsampling_mips_dsp_r2.c",
       "../externals/libwebp/src/dsp/upsampling_msa.c",
@@ -133,12 +143,15 @@
       "../externals/libwebp/src/dsp/yuv.c",
       "../externals/libwebp/src/dsp/yuv_mips32.c",
       "../externals/libwebp/src/dsp/yuv_mips_dsp_r2.c",
+      "../externals/libwebp/src/dsp/yuv_neon.c",
       "../externals/libwebp/src/dsp/yuv_sse2.c",
       "../externals/libwebp/src/enc/alpha_enc.c",
       "../externals/libwebp/src/enc/analysis_enc.c",
+      "../externals/libwebp/src/enc/backward_references_cost_enc.c",
       "../externals/libwebp/src/enc/backward_references_enc.c",
       "../externals/libwebp/src/enc/config_enc.c",
       "../externals/libwebp/src/enc/cost_enc.c",
+      "../externals/libwebp/src/enc/delta_palettization_enc.c",
       "../externals/libwebp/src/enc/filter_enc.c",
       "../externals/libwebp/src/enc/frame_enc.c",
       "../externals/libwebp/src/enc/histogram_enc.c",