chromium: Chromium 63.0.3239.132 -> 64.0.3282.119

5 files changed, 144 insertions, 44 deletions

diff --git a/chromium/chromium/chromium-angle.patch b/chromium/chromium/chromium-angle.patch
new file mode 100644
index 0000000..462b8ae
--- /dev/null
+++ b/chromium/chromium/chromium-angle.patch
@@ -0,0 +1,89 @@
+From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
+From: Kai Ninomiya <kainino@chromium.org>
+Date: Wed, 06 Dec 2017 14:06:53 -0800
+Subject: [PATCH] Mark StaticType related functions as constexpr
+
+Fixes compilation on some versions of GCC and probably Clang.
+
+Follow-up to http://crrev.com/c/786317
+
+Bug: angleproject:1432
+Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
+Reviewed-on: https://chromium-review.googlesource.com/812220
+Reviewed-by: Jamie Madill <jmadill@chromium.org>
+Commit-Queue: Kai Ninomiya <kainino@chromium.org>
+---
+
+diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h
+index e26e5ff..30b391a 100644
+--- a/third_party/angle/src/compiler/translator/StaticType.h
++++ b/third_party/angle/src/compiler/translator/StaticType.h
+@@ -160,7 +160,7 @@
+           TPrecision precision,
+           TQualifier qualifier,
+           unsigned char secondarySize>
+-const TType *GetForVecMatHelper(unsigned char primarySize)
++constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
+ {
+     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
+                       basicType == EbtBool,
+@@ -186,7 +186,7 @@
+ template <TBasicType basicType,
+           TPrecision precision = EbpUndefined,
+           TQualifier qualifier = EvqGlobal>
+-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
++constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
+ {
+     static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
+                       basicType == EbtBool,
+@@ -208,7 +208,7 @@
+ }
+ 
+ template <TBasicType basicType, TPrecision precision = EbpUndefined>
+-const TType *GetForVec(TQualifier qualifier, unsigned char size)
++constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
+ {
+     switch (qualifier)
+     {
+diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp
+index adf1e4e..90d4c15 100644
+--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
++++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
+@@ -236,7 +236,7 @@
+         pop();
+ }
+ 
+-bool IsGenType(const TType *type)
++constexpr bool IsGenType(const TType *type)
+ {
+     if (type)
+     {
+@@ -248,7 +248,7 @@
+     return false;
+ }
+ 
+-bool IsVecType(const TType *type)
++constexpr bool IsVecType(const TType *type)
+ {
+     if (type)
+     {
+diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h
+index 04f46f1..a54d447 100644
+--- a/third_party/angle/src/compiler/translator/Types.h
++++ b/third_party/angle/src/compiler/translator/Types.h
+@@ -142,13 +142,13 @@
+     {
+     }
+ 
+-    TBasicType getBasicType() const { return type; }
++    constexpr TBasicType getBasicType() const { return type; }
+     void setBasicType(TBasicType t);
+ 
+     TPrecision getPrecision() const { return precision; }
+     void setPrecision(TPrecision p) { precision = p; }
+ 
+-    TQualifier getQualifier() const { return qualifier; }
++    constexpr TQualifier getQualifier() const { return qualifier; }
+     void setQualifier(TQualifier q) { qualifier = q; }
+ 
+     bool isInvariant() const { return invariant; }
diff --git a/chromium/chromium/chromium-cc-memcpy.patch b/chromium/chromium/chromium-cc-memcpy.patch
new file mode 100644
index 0000000..dd2fd57
--- /dev/null
+++ b/chromium/chromium/chromium-cc-memcpy.patch
@@ -0,0 +1,35 @@
+From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tomas.popela@gmail.com>
+Date: Thu, 7 Dec 2017 22:33:34 +0000
+Subject: [PATCH] memcpy used without including string.h
+
+Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
+memcpy without including string.h.
+
+Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
+Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
+Reviewed-on: https://chromium-review.googlesource.com/813737
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: vmpstr <vmpstr@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#522579}
+---
+ cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc
+index 9e4660c685ee..95ad50b1a338 100644
+--- a/cc/paint/raw_memory_transfer_cache_entry.cc
++++ b/cc/paint/raw_memory_transfer_cache_entry.cc
+@@ -4,6 +4,8 @@
+ 
+ #include "cc/paint/raw_memory_transfer_cache_entry.h"
+ 
++#include <string.h>
++
+ namespace cc {
+ 
+ ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
+-- 
+2.15.1
+
diff --git a/chromium/chromium/chromium-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh
index 5aa30a3..7ab7cbb 100755
--- a/chromium/chromium/chromium-ffmpeg-clean.sh
+++ b/chromium/chromium/chromium-ffmpeg-clean.sh
@@ -75,9 +75,11 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/aacps.h \
 		libavcodec/aacpsdsp.h \
 		libavcodec/aacsbrdata.h \
+		libavcodec/aac_ac3_parser.h \
 		libavcodec/aac_defines.h \
 		libavcodec/ac3.h \
 		libavcodec/ac3tab.h \
+		libavcodec/adts_header.h \
 		libavcodec/avcodec.h \
 		libavcodec/blockdsp.h \
 		libavcodec/bytestream.h \
@@ -106,7 +108,9 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/mdct15.h \
 		libavcodec/me_cmp.h \
 		libavcodec/motion_est.h \
+		libavcodec/mpeg12.h \
 		libavcodec/mpeg12data.h \
+		libavcodec/mpeg12vlc.h \
 		libavcodec/mpegaudio.h \
 		libavcodec/mpegaudiodecheader.h \
 		libavcodec/mpegaudiodectab.h \
@@ -251,7 +255,6 @@ mp3_files="	libavcodec/aarch64/mpegaudiodsp_init.c \
 		libavcodec/aarch64/mpegaudiodsp_neon.S \
 		libavcodec/aac_ac3_parser.c \
 		libavcodec/aac_parser.c \
-		libavcodec/aacadtsdec.c \
 		libavcodec/aacps_float.c \
 		libavcodec/aacpsdsp_float.c \
 		libavcodec/aacsbr.c \
@@ -310,8 +313,7 @@ other_files="	BUILD.gn \
 		OWNERS \
 		README.chromium \
 		README.md \
-		RELEASE \
-		xcode_hack.c "
+		RELEASE "
 
 cd "$1/third_party/ffmpeg" || exit 1
 
diff --git a/chromium/chromium/chromium-webrtc-math.patch b/chromium/chromium/chromium-webrtc-math.patch
deleted file mode 100644
index e14b185..0000000
--- a/chromium/chromium/chromium-webrtc-math.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Fri, 13 Oct 2017 15:49:32 +0200
-Subject: [PATCH] IWYU: Include math.h for round(3).
-
-math.h was being implicitly included, which can break the build with
-alternative libc implementations.
-
-Bug: None
-Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
-Reviewed-on: https://webrtc-review.googlesource.com/9384
-Reviewed-by: Tommi <tommi@webrtc.org>
-Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#20292}
----
- p2p/base/port.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/p2p/base/port.cc b/p2p/base/port.cc
-index a1b478d11..81aa0aadb 100644
---- a/third_party/webrtc/p2p/base/port.cc
-+++ b/third_party/webrtc/p2p/base/port.cc
-@@ -10,6 +10,8 @@
- 
- #include "p2p/base/port.h"
- 
-+#include <math.h>
-+
- #include <algorithm>
- #include <vector>
- 
--- 
-2.15.0.rc2
-
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index fcfbe29..af9063c 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -58,7 +58,7 @@
 %bcond_with fedora_compilation_flags
 
 Name:       chromium
-Version:    63.0.3239.132
+Version:    64.0.3282.119
 Release:    100%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
@@ -78,7 +78,7 @@ URL:        https://www.chromium.org/Home
 # Source0:    https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
 #
 # The repackaged source tarball used here is produced by:
-# ./chromium-latest.py --stable --ffmpegclean
+# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm
 Source0:    chromium-%{version}-clean.tar.xz
 Source1:    chromium-latest.py
 Source2:    chromium-ffmpeg-clean.sh
@@ -98,9 +98,14 @@ Source13:   chromium-browser.appdata.xml
 # https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=0df9641
 Patch10:    chromium-last-commit-position.patch
 
-# Add a patch from Gentoo to fix the missing include
-# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3838ab
-Patch20:    chromium-webrtc-math.patch
+# Add a patch from Gentoo to fix ANGLE build
+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a8dd9f
+Patch20:    chromium-angle.patch
+
+# Add a patch from Gentoo to fix ANGLE build
+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b71cea
+# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad380a
+Patch30:    chromium-cc-memcpy.patch
 
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
@@ -232,6 +237,7 @@ Conflicts:     chromedriver-unstable
     third_party/angle/src/third_party/libXNVCtrl \
     third_party/angle/src/third_party/trace_event \
     third_party/boringssl \
+    third_party/boringssl/src/third_party/fiat \
     third_party/blink \
     third_party/breakpad \
     third_party/breakpad/breakpad/src/third_party/curl \
@@ -248,7 +254,6 @@ Conflicts:     chromedriver-unstable
     third_party/catapult/tracing/third_party/oboe \
     third_party/catapult/tracing/third_party/pako \
     third_party/ced \
-    third_party/cld_2 \
     third_party/cld_3 \
     third_party/crc32c \
     third_party/cros_system_api \
@@ -300,6 +305,7 @@ Conflicts:     chromedriver-unstable
     third_party/lss \
     third_party/lzma_sdk \
     third_party/mesa \
+    third_party/metrics_proto \
     third_party/modp_b64 \
     third_party/mt19937ar \
     third_party/node \
@@ -440,7 +446,6 @@ gn_args=(
     use_system_harfbuzz=true
 %endif
     enable_hangout_services_extension=false
-    enable_hotwording=false
     enable_nacl=true
     enable_webrtc=true
     fatal_linker_warnings=false
@@ -590,6 +595,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Jan 25 2018 - Ting-Wei Lan <lantw44@gmail.com> - 64.0.3282.119-100
+- Update to 64.0.3282.119
+
 * Fri Jan 05 2018 - Ting-Wei Lan <lantw44@gmail.com> - 63.0.3239.132-100
 - Update to 63.0.3239.132