community/chromium: upgrade to 72.0.3626.109 and fix deadlock

ref #9808

Upstream bug report: https://bugs.chromium.org/p/v8/issues/detail?id=8881

10 files changed, 77 insertions, 825 deletions

diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 10c9067190..831b83124c 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=chromium
-pkgver=71.0.3578.98
-pkgrel=2
+pkgver=72.0.3626.109
+pkgrel=0
 pkgdesc="chromium web browser"
 url="http://www.chromium.org/"
 arch="x86_64" # aarch64 armhf armv7 temp disable because we need clang for arm
@@ -17,8 +17,6 @@ makedepends="$depends_dev
 	bsd-compat-headers
 	bzip2-dev
 	cairo-dev
-	clang
-	clang-dev
 	cups-dev
 	dbus-glib-dev
 	eudev-dev
@@ -89,7 +87,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
 	google-api.keys
 
 	default-pthread-stacksize.patch
-	gn-bootstrap-remove-sysroot-related-options.patch
 	musl-fixes.patch
 	musl-fixes-breakpad.patch
 	musl-hacks.patch
@@ -103,14 +100,12 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
 
 	chromium-use-alpine-target.patch
 	chromium-gcc-r1.patch
-	chromium-skia-harmony.patch
 	media-base.patch
 	musl-crashpad.patch
-	chromium-71-gcc-0.patch
+	musl-v8-fix-deadlock.patch
+	musl-v8-monotonic-pthread-cont_timedwait.patch
 	gcc8-alignof.patch
-	chromium-fix_harfbuzz_2.patch
-	chromium-enable-vaapi.patch
-	chromium-i686-vaapi-fpermissive.patch
+	gcc-fno-delete-null-pointer-checks.patch
 	"
 
 builddir="$srcdir"/$pkgname-$pkgver
@@ -148,6 +143,7 @@ prepare() {
 		ffmpeg
 		flac
 		fontconfig
+		freetype
 		harfbuzz-ng
 		libdrm
 		libevent
@@ -193,8 +189,6 @@ build() {
 	##############################################################
 	eval "$(base64 -d < $srcdir/google-api.keys)"
 
-	local _ca=""
-
 	msg "Bootstrapping GN"
 	local _c=$(_gn_flags is_clang=false \
 		use_sysroot=false \
@@ -208,11 +202,12 @@ build() {
 	)
 
 	AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" \
-		python tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c $_ca"
+		python tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c"
 
 	msg "Configuring build"
 	_c=$(_gn_flags \
 		clang_use_chrome_plugins=false \
+		closure_compile=false \
 		custom_toolchain=\"//build/toolchain/linux/unbundle:default\" \
 		enable_hangout_services_extension=true \
 		enable_nacl=false \
@@ -228,6 +223,7 @@ build() {
 		host_toolchain=\"//build/toolchain/linux/unbundle:default\" \
 		icu_use_data_file=true \
 		is_clang=false \
+		is_component_build=false \
 		is_debug=$_is_debug \
 		is_desktop_linux=true \
 		linux_use_bundled_binutils=false \
@@ -245,7 +241,6 @@ build() {
 		use_pulseaudio=false \
 		use_sysroot=false \
 		use_system_harfbuzz=true \
-		use_vaapi=true \
 	)
 
 	AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" NM=/usr/bin/nm \
@@ -325,14 +320,13 @@ chromedriver() {
 	mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin
 }
 
-sha512sums="dbeb90e16c6c05422c1f43e8fe747d60dab49c1fffdd0f33824ca24429f3871bda649eb1e6402470d3d9bb701e47d55d2fff4f46530e3f43e72f516d1837aad6  chromium-71.0.3578.98.tar.xz
+sha512sums="1eb681d085657c7ae3485164f8e2e80c12f65361072f0101d3659c6161e2bf1d647226e98860cbcda8ff1f44542ac32508eb19f3a645886e87c37fae6affeb1c  chromium-72.0.3626.109.tar.xz
 a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29  pstables-2.8.h
 b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60  chromium-launcher.sh
 f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f  chromium.conf
 e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c  chromium.desktop
 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac  google-api.keys
 230d1819b9d644ebaa6e194e948d662add8d237a99cc3d6b0f8a2fc2b331b43a3cd0766746f1c76c1a114f1730b40504c532d0c40aafa8cbc45022663cbcc245  default-pthread-stacksize.patch
-1c7398a68ee01b9d61c1bb1a3e6dfcc88662da42b9012844040bd86e858228dc480c7f21d2c52829e9959e4a3f6e39b8c5cb22f8f7c8394322c8347d828b6625  gn-bootstrap-remove-sysroot-related-options.patch
 9cd1defffb55cd1290e82b233a623e962775e19f001b26ae8f74330f3467499fd16067d607ca8e2b0b9b8d8988cd7ea2af93df65d7cc3d9299b8bc2b472c712e  musl-fixes.patch
 90efbc89151c77f32434364dcbaabaf9d9a207f4a77f147cd51b3fe100832fbfb3a9fb665303a79a3d788e400f4f41890de202ccbb7bd1fc6252e33c6e74e429  musl-fixes-breakpad.patch
 0aa3176f1021332088740d6e4fe2eadbe375240df0690c8449426a42a674fdf58e8a1fda85ca527dc1b4451e964d54564283fd81e3b7df059f5bcfccb8e07e84  musl-hacks.patch
@@ -345,11 +339,9 @@ db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f
 1b8647ab4081ec27f142eb564841b603dbf4c41118502e43b061d06f8866ebd1418d676457ed9ee0dc0a759e0369a29219bea98e74f687ddcba5d4513ca460ba  secure_getenv.patch
 246c43a0ab557671119ebc4ecb292925ebfee25312fb50e739a179dc085d23b9623bec2d7baecdd37ebd9318f8770664f20c12de6383def74cd89b7845d149ce  chromium-use-alpine-target.patch
 6e2bcbed44786c6c0d3beda935269f30fdcdf07c400defa6bf73f8359a60b1d59cc2f80dbc106be651a535635995641321d9e524b18919d3975bd6008a641d59  chromium-gcc-r1.patch
-cbd99d51178fa5c2c3dee1eb4990240ca2ff829cee9151384e36bc3c634698c0ecaf9b51c99e901f38d0a37eef7187fe5ad39b9b7f528f7a9066a855a0c6e49f  chromium-skia-harmony.patch
 589a7acf149d44db081da2dd24a7769f2b9572a8cc64d2aad78577a64768d3b6fb2bfa02292b5260acd2c4a28c3ae9b82847ff901ce8a21baeca0b46dcda0ca9  media-base.patch
 05c1af43038f76014f5f8b605085310414242f2bfad0e3258ddb29a08e7f4307de31b2d551b0a291986cc7d5a01cf3a003ac864216877195bb4310fd33193f0f  musl-crashpad.patch
-74fcae35afd964e2dc09508325465ee0d2efd13b94941eaf6464da1f4b32a34b326cf2c290fffcfc930acefda51a64dfbc980527900849efb5a94922cc17bc20  chromium-71-gcc-0.patch
+2c22e0d56b2557bafc842043911ecd0f8f70589013aeb7d3e8c7c8a5622bdbfe1f249e7223991ebf6130c7a45c7771a02dcc096dd03c48e2559ea4741147cfce  musl-v8-fix-deadlock.patch
+6953e83d4034f7a016dd055fed152a8a448f741a4c4f7a8f3b03cc7a4589d3d3c03775f844d76d6d4478ac15c655fee0be7355f0d5062ddc7fa9f6ce4b011116  musl-v8-monotonic-pthread-cont_timedwait.patch
 9bfc532fd1e84e30362ac41fcd68253e17ee4cb5e986ceb5bb122e3235e4617e295ce9dddfdfbbd0b9d3e67267096152da2a19e3bb4bb9111c7fdb22fa398872  gcc8-alignof.patch
-4e6bfecdece829306b8c2ea2a4b6d9b0598f97e5b164e0f468e765ffa10cac6b9e57c8814b79eb1244a314d81e8954654111a2e1e056b2c450b369994337cb40  chromium-fix_harfbuzz_2.patch
-b0e61b4710a8e9009bd9c10722d902391b83c0400a48a6a40cc0e117ca4c1895732babe5baa078f5b3096b72d105fa2d1f4196f8d35c1ae94ff4d8d99d2a17f5  chromium-enable-vaapi.patch
-42d64d07215476295a35568e4492297a00b66205b5a41288a98b1663985fe1868e9595e961284dfbbd8b5846cc1b04e365ab89733270ffbc6967e3366571cf47  chromium-i686-vaapi-fpermissive.patch"
+bb0f3dc1ade429a398d487ae190a278948533398c4a1085aeb35ff57fefb90a1e598008ba839423ca0acd30ba4c992950f395dba3b9994d3c7187fe68b9a93d7  gcc-fno-delete-null-pointer-checks.patch"
diff --git a/community/chromium/chromium-71-gcc-0.patch b/community/chromium/chromium-71-gcc-0.patch
deleted file mode 100644
index 8ffadff20b..0000000000
--- a/community/chromium/chromium-71-gcc-0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 65be571f6ac2f7942b4df9e50b24da517f829eec Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-Date: Mon, 15 Oct 2018 20:26:10 +0000
-Subject: [PATCH] google_util: Explicitly use std::initializer_list with
- base::NoDestructor
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Follow-up to ac53c5c53 ("Remove CR_DEFINE_STATIC_LOCAL from /components").
-Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having
-base::NoDestructor<T<U>> and passing an initializer list of Us does not
-work if this is not done explicitly, as GCC incorrectly fails to determine
-which constructor overload to use:
-
-    ../../components/google/core/common/google_util.cc: In function ‘bool google_util::{anonymous}::IsCanonicalHostGoogleHostname(base::StringPiece, google_util::SubdomainPermission)’:
-    ../../components/google/core/common/google_util.cc:120:24: error: call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is ambiguous
-           {GOOGLE_TLD_LIST});
-
-See also: https://chromium-review.googlesource.com/c/chromium/src/+/1170905
-
-Bug: 819294
-Change-Id: Ie1490b6646d7998d636c485769caabf56c1cf44c
-Reviewed-on: https://chromium-review.googlesource.com/c/1275854
-Reviewed-by: Peter Kasting <pkasting@chromium.org>
-Commit-Queue: Raphael Kubo da Costa (CET) <raphael.kubo.da.costa@intel.com>
-Cr-Commit-Position: refs/heads/master@{#599733}
----
- components/google/core/common/google_util.cc | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
-index a44c84393820..7733848a0443 100644
---- components/google/core/common/google_util.cc
-+++ components/google/core/common/google_util.cc
-@@ -117,7 +117,7 @@ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
-   StripTrailingDot(&tld);
- 
-   static base::NoDestructor<std::set<std::string>> google_tlds(
--      {GOOGLE_TLD_LIST});
-+      std::initializer_list<std::string>({GOOGLE_TLD_LIST}));
-   return base::ContainsKey(*google_tlds, tld.as_string());
- }
- 
-@@ -132,7 +132,8 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) {
-   StripTrailingDot(&host);
- 
-   static base::NoDestructor<std::set<std::string>> google_subdomains(
--      {"ipv4.google.com", "ipv6.google.com"});
-+      std::initializer_list<std::string>(
-+          {"ipv4.google.com", "ipv6.google.com"}));
- 
-   return base::ContainsKey(*google_subdomains, host.as_string());
- }
--- 
-2.19.1
-
diff --git a/community/chromium/chromium-enable-vaapi.patch b/community/chromium/chromium-enable-vaapi.patch
deleted file mode 100644
index 24f1ba77f7..0000000000
--- a/community/chromium/chromium-enable-vaapi.patch
+++ /dev/null
@@ -1,542 +0,0 @@
-diff -ur chrome/browser/about_flags.cc chromium-69.0.3497.92/chrome/browser/about_flags.cc
---- chrome/browser/about_flags.cc	2018-09-12 00:39:23.000000000 +0530
-+++ chrome/browser/about_flags.cc	2018-09-13 22:10:33.938016199 +0530
-@@ -1238,12 +1238,14 @@
-     {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
-      flag_descriptions::kUiPartialSwapDescription, kOsAll,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-     {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
-      flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
-     {"disable-webrtc-hw-encoding", flag_descriptions::kWebrtcHwEncodingName,
-      flag_descriptions::kWebrtcHwEncodingDescription, kOsAndroid | kOsCrOS,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
-+#endif
-     {"enable-webrtc-hw-h264-encoding",
-      flag_descriptions::kWebrtcHwH264EncodingName,
-      flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
-@@ -1612,6 +1614,13 @@
-      flag_descriptions::kShowTouchHudDescription, kOsCrOS,
-      SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
- #endif  // OS_CHROMEOS
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    {
-+        "enable-accelerated-video", flag_descriptions::kAcceleratedVideoName,
-+        flag_descriptions::kAcceleratedVideoDescription, kOsLinux,
-+        SINGLE_VALUE_TYPE(switches::kEnableAcceleratedVideo),
-+    },
-+#else
-     {
-         "disable-accelerated-video-decode",
-         flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1619,6 +1628,7 @@
-         kOsMac | kOsWin | kOsCrOS | kOsAndroid,
-         SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
-     },
-+#endif
- #if defined(OS_WIN)
-     {"enable-hdr", flag_descriptions::kEnableHDRName,
-      flag_descriptions::kEnableHDRDescription, kOsWin,
-@@ -2291,12 +2301,17 @@
-      FEATURE_VALUE_TYPE(features::kOpenVR)},
- #endif  // ENABLE_OPENVR
- #endif  // ENABLE_VR
--#if defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    {"enable-accelerated-mjpeg-decode",
-+     flag_descriptions::kAcceleratedMjpegDecodeName,
-+     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsLinux,
-+     SINGLE_VALUE_TYPE(switches::kEnableAcceleratedMjpegDecode)},
-+#elif defined(OS_CHROMEOS)
-     {"disable-accelerated-mjpeg-decode",
-      flag_descriptions::kAcceleratedMjpegDecodeName,
-      flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
--#endif  // OS_CHROMEOS
-+#endif
-     {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
-      flag_descriptions::kV8CacheOptionsDescription, kOsAll,
-      MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-Only in chrome/browser: about_flags.cc.orig
-diff -ur chrome/browser/chromeos/login/chrome_restart_request.cc chromium-69.0.3497.92/chrome/browser/chromeos/login/chrome_restart_request.cc
---- chrome/browser/chromeos/login/chrome_restart_request.cc	2018-09-12 00:39:23.000000000 +0530
-+++ chrome/browser/chromeos/login/chrome_restart_request.cc	2018-09-13 22:10:33.986014728 +0530
-@@ -19,6 +19,7 @@
- #include "base/sys_info.h"
- #include "base/timer/timer.h"
- #include "base/values.h"
-+#include "build/build_config.h"
- #include "cc/base/switches.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/chromeos/boot_times_recorder.h"
-@@ -84,9 +85,14 @@
-     ::switches::kDisable2dCanvasImageChromium,
-     ::switches::kDisableAccelerated2dCanvas,
-     ::switches::kDisableAcceleratedJpegDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+    ::switches::kEnableAcceleratedMjpegDecode,
-+    ::switches::kEnableAcceleratedVideo,
-+#else
-     ::switches::kDisableAcceleratedMjpegDecode,
-     ::switches::kDisableAcceleratedVideoDecode,
-     ::switches::kDisableAcceleratedVideoEncode,
-+#endif
-     ::switches::kDisableBlinkFeatures,
-     ::switches::kDisableCastStreamingHWEncoding,
-     ::switches::kDisableGpu,
-@@ -160,8 +166,10 @@
-     ::switches::kEnableWebGLImageChromium,
-     ::switches::kEnableWebVR,
-     ::switches::kEnableUnsafeWebGPU,
-+#if (defined(OS_CHROMEOS) || defined(OS_ANDROID))
-     ::switches::kDisableWebRtcHWDecoding,
-     ::switches::kDisableWebRtcHWEncoding,
-+#endif
-     ::switches::kOzonePlatform,
-     ash::switches::kAshEnableTabletMode,
-     ash::switches::kAshEnableWaylandServer,
-diff -ur chrome/browser/flag_descriptions.cc chromium-69.0.3497.92/chrome/browser/flag_descriptions.cc
---- chrome/browser/flag_descriptions.cc	2018-09-12 00:39:24.000000000 +0530
-+++ chrome/browser/flag_descriptions.cc	2018-09-13 22:10:34.007014085 +0530
-@@ -14,6+14,13 @@
-     "Enables the use of the GPU to perform 2d canvas rendering instead of "
-     "using software rendering.";
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+const char kAcceleratedVideoName[] = "Hardware-accelerated video";
-+const char kAcceleratedVideoDescription[] =
-+    "Hardware-accelerated video where VA-API driver is installed on the"
-+    "system.";
-+#endif
-+
- const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
- const char kAcceleratedVideoDecodeDescription[] =
-     "Hardware-accelerated video decode where available.";
-@@ -1986,6 +1993,7 @@
- const char kWebrtcEchoCanceller3Description[] =
-     "Experimental WebRTC echo canceller (AEC3).";
- 
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
- const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
- const char kWebrtcHwDecodingDescription[] =
-     "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -1993,6 +2001,7 @@
- const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
- const char kWebrtcHwEncodingDescription[] =
-     "Support in WebRTC for encoding video streams using platform hardware.";
-+#endif
- 
- const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
- const char kWebrtcHwH264EncodingDescription[] =
-@@ -2892,14 +2901,16 @@
- 
- // Chrome OS -------------------------------------------------------------------
- 
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
- 
- const char kAcceleratedMjpegDecodeName[] =
-     "Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
-     "Enable hardware-accelerated mjpeg decode for captured frame where "
-     "available.";
-+#endif
- 
-+#if defined(OS_CHROMEOS)
- const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
- const char kAllowTouchpadThreeFingerClickDescription[] =
-     "Enables touchpad three-finger-click as middle button.";
-diff -ur chrome/browser/flag_descriptions.h chromium-69.0.3497.92/chrome/browser/flag_descriptions.h
---- chrome/browser/flag_descriptions.h	2018-09-12 00:39:24.000000000 +0530
-+++ chrome/browser/flag_descriptions.h	2018-09-13 22:10:34.030013380 +0530
-@@ -37,6 +37,10 @@
- extern const char kAccelerated2dCanvasName[];
- extern const char kAccelerated2dCanvasDescription[];
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+extern const char kAcceleratedVideoName[];
-+extern const char kAcceleratedVideoDescription[];
-+#endif
- extern const char kAcceleratedVideoDecodeName[];
- extern const char kAcceleratedVideoDecodeDescription[];
- 
-@@ -1762,13 +1766,17 @@
- 
- #endif  // defined(OS_MACOSX)
- 
--// Chrome OS ------------------------------------------------------------------
--
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
- 
- extern const char kAcceleratedMjpegDecodeName[];
- extern const char kAcceleratedMjpegDecodeDescription[];
- 
-+#endif
-+
-+// Chrome OS ------------------------------------------------------------------
-+
-+#if defined(OS_CHROMEOS)
-+
- extern const char kAllowTouchpadThreeFingerClickName[];
- extern const char kAllowTouchpadThreeFingerClickDescription[];
- 
-diff -ur content/browser/gpu/compositor_util.cc chromium-69.0.3497.92/content/browser/gpu/compositor_util.cc
---- content/browser/gpu/compositor_util.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/compositor_util.cc	2018-09-13 22:10:34.072012092 +0530
-@@ -149,7 +149,11 @@
-       {"video_decode",
-        SafeGetFeatureStatus(gpu_feature_info,
-                             gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+       !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
-+#else
-        command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
-+#endif
-        "Accelerated video decode has been disabled, either via blacklist, "
-        "about:flags or the command line.",
-        true, true},
-diff -ur content/browser/gpu/gpu_process_host.cc chromium-69.0.3497.92/content/browser/gpu/gpu_process_host.cc
---- content/browser/gpu/gpu_process_host.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/gpu/gpu_process_host.cc	2018-09-13 22:10:34.113010836 +0530
-@@ -209,7 +209,9 @@
-     switches::kDisableLogging,
-     switches::kDisableShaderNameHashing,
-     switches::kDisableSkiaRuntimeOpts,
-+#if !defined(OS_LINUX)
-     switches::kDisableWebRtcHWEncoding,
-+#endif
- #if defined(OS_WIN)
-     switches::kEnableAcceleratedVpxDecode,
- #endif
-diff -ur content/browser/renderer_host/media/video_capture_browsertest.cc chromium-69.0.3497.92/content/browser/renderer_host/media/video_capture_browsertest.cc
---- content/browser/renderer_host/media/video_capture_browsertest.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/media/video_capture_browsertest.cc	2018-09-13 22:10:34.124010499 +0530
-@@ -165,8 +165,13 @@
-       base::CommandLine::ForCurrentProcess()->AppendSwitch(
-           switches::kUseFakeJpegDecodeAccelerator);
-     } else {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+      base::CommandLine::ForCurrentProcess()->AppendSwitch(
-+          switches::kEnableAcceleratedMjpegDecode);
-+#else
-       base::CommandLine::ForCurrentProcess()->AppendSwitch(
-           switches::kDisableAcceleratedMjpegDecode);
-+#endif
-     }
-   }
- 
-diff -ur content/browser/renderer_host/render_process_host_impl.cc chromium-69.0.3497.92/content/browser/renderer_host/render_process_host_impl.cc
---- content/browser/renderer_host/render_process_host_impl.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/renderer_host/render_process_host_impl.cc	2018-09-13 22:10:34.133010223 +0530
-@@ -2798,7 +2798,11 @@
-     switches::kDefaultTileHeight,
-     switches::kDisable2dCanvasImageChromium,
-     switches::kDisableAcceleratedJpegDecoding,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+    switches::kEnableAcceleratedVideo,
-+#else
-     switches::kDisableAcceleratedVideoDecode,
-+#endif
-     switches::kDisableBackgroundTasks,
-     switches::kDisableBackgroundTimerThrottling,
-     switches::kDisableBreakpad,
-@@ -2933,8 +2937,10 @@
- #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
-     switches::kDisableMojoRenderer,
- #endif
-+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-     switches::kDisableWebRtcHWDecoding,
-     switches::kDisableWebRtcHWEncoding,
-+#endif
-     switches::kEnableWebRtcSrtpAesGcm,
-     switches::kEnableWebRtcSrtpEncryptedHeaders,
-     switches::kEnableWebRtcStunOrigin,
-Only in content/browser/renderer_host: render_process_host_impl.cc.orig
-diff -ur content/browser/utility_process_host.cc chromium-69.0.3497.92/content/browser/utility_process_host.cc
---- content/browser/utility_process_host.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/utility_process_host.cc	2018-09-13 22:10:34.296005227 +0530
-@@ -296,7 +296,11 @@
-       switches::kOverrideUseSoftwareGLForTests,
-       switches::kOverrideEnabledCdmInterfaceVersion,
-       switches::kProxyServer,
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+      switches::kEnableAcceleratedMjpegDecode,
-+#else
-       switches::kDisableAcceleratedMjpegDecode,
-+#endif
-       switches::kUseFakeDeviceForMediaStream,
-       switches::kUseFakeJpegDecodeAccelerator,
-       switches::kUseFileForFakeVideoCapture,
-diff -ur content/browser/webrtc/webrtc_media_recorder_browsertest.cc chromium-69.0.3497.92/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
---- content/browser/webrtc/webrtc_media_recorder_browsertest.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/browser/webrtc/webrtc_media_recorder_browsertest.cc	2018-09-13 22:10:34.143009916 +0530
-@@ -66,7 +66,12 @@
-       return;
-     // This flag is also used for encoding, https://crbug.com/616640.
-     base::CommandLine::ForCurrentProcess()->AppendSwitch(
--        switches::kDisableAcceleratedVideoDecode);
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+        switches::kEnableAcceleratedVideo
-+#else
-+        switches::kDisableAcceleratedVideoDecode
-+#endif
-+        );
-   }
- 
-  private:
-diff -ur content/gpu/BUILD.gn chromium-69.0.3497.92/content/gpu/BUILD.gn
---- content/gpu/BUILD.gn	2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/BUILD.gn	2018-09-13 22:10:34.148009763 +0530
-@@ -133,4 +133,8 @@
-       (!is_chromecast || is_cast_desktop_build)) {
-     configs += [ "//build/config/linux/dri" ]
-   }
-+
-+  if (is_desktop_linux) {
-+    public_configs = [ "//media/gpu:libva_config" ]
-+  }
- }
-diff -ur content/gpu/gpu_main.cc chromium-69.0.3497.92/content/gpu/gpu_main.cc
---- content/gpu/gpu_main.cc	2018-09-12 00:39:41.000000000 +0530
-+++ content/gpu/gpu_main.cc	2018-09-13 22:10:34.153009610 +0530
-@@ -284,7 +284,7 @@
- 
-   base::PlatformThread::SetName("CrGpuMain");
- 
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX)
-   // Set thread priority before sandbox initialization.
-   base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
- #endif
-@@ -317,7 +317,7 @@
-   GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
- 
-   base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
--#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX)
-   io_thread_priority = base::ThreadPriority::DISPLAY;
- #endif
- 
-diff -ur content/public/browser/gpu_utils.cc chromium-69.0.3497.92/content/public/browser/gpu_utils.cc
---- content/public/browser/gpu_utils.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/browser/gpu_utils.cc	2018-09-13 22:10:34.164009273 +0530
-@@ -57,9 +57,17 @@
-   gpu_preferences.in_process_gpu =
-       command_line->HasSwitch(switches::kInProcessGPU);
-   gpu_preferences.disable_accelerated_video_decode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
-       command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-+#endif
-   gpu_preferences.disable_accelerated_video_encode =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
-+#else
-       command_line->HasSwitch(switches::kDisableAcceleratedVideoEncode);
-+#endif
- #if defined(OS_WIN)
-   uint32_t enable_accelerated_vpx_decode_val =
-       gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
-diff -ur content/public/common/content_switches.cc chromium-69.0.3497.92/content/public/common/content_switches.cc
---- content/public/common/content_switches.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.cc	2018-09-13 22:10:34.172009028 +0530
-@@ -79,6 +79,11 @@
- // Disable gpu-accelerated 2d canvas.
- const char kDisableAccelerated2dCanvas[]    = "disable-accelerated-2d-canvas";
- 
-+#if defined(OS_LINUX)
-+// Enables hardware acceleration of video for Linux only. VA-API driver
-+// is required to be present on the system installation.
-+const char kEnableAcceleratedVideo[] = "enable-accelerated-video";
-+#endif
- // Disables hardware acceleration of video decode, where available.
- const char kDisableAcceleratedVideoDecode[] =
-     "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@
- // ignores this switch on its stable and beta channels.
- const char kDisableWebRtcEncryption[]      = "disable-webrtc-encryption";
- 
-+#if defined(OS_CHROMEOS)
- // Disables HW decode acceleration for WebRTC.
- const char kDisableWebRtcHWDecoding[]       = "disable-webrtc-hw-decoding";
- 
- // Disables HW encode acceleration for WebRTC.
- const char kDisableWebRtcHWEncoding[] = "disable-webrtc-hw-encoding";
-+#endif
- 
- // Enables negotiation of GCM cipher suites from RFC 7714 for SRTP in WebRTC.
- // See https://tools.ietf.org/html/rfc7714 for further information.
-diff -ur content/public/common/content_switches.h chromium-69.0.3497.92/content/public/common/content_switches.h
---- content/public/common/content_switches.h	2018-09-12 00:39:42.000000000 +0530
-+++ content/public/common/content_switches.h	2018-09-13 22:10:34.172009028 +0530
-@@ -104,6 +104,9 @@
- CONTENT_EXPORT extern const char kDomAutomationController[];
- extern const char kDisable2dCanvasClipAntialiasing[];
- CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+CONTENT_EXPORT extern const char kEnableAcceleratedVideo[];
-+#endif
- CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
- CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
- CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@
- CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
- 
- CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
-+#if defined(OS_CHROMEOS)
- CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
- CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
-+#endif
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
- CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
- CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
-diff -ur content/renderer/media/webrtc/peer_connection_dependency_factory.cc chromium-69.0.3497.92/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
---- content/renderer/media/webrtc/peer_connection_dependency_factory.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/media/webrtc/peer_connection_dependency_factory.cc	2018-09-13 22:10:34.181008752 +0530
-@@ -276,10 +276,18 @@
- 
-   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-   if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+    if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
-+#else
-     if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))
-+#endif
-       decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+    if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
-+#else
-     if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
-+#endif
-       encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
-   }
- 
-diff -ur content/renderer/render_thread_impl.cc chromium-69.0.3497.92/content/renderer/render_thread_impl.cc
---- content/renderer/render_thread_impl.cc	2018-09-12 00:39:42.000000000 +0530
-+++ content/renderer/render_thread_impl.cc	2018-09-13 22:10:34.192008415 +0530
-@@ -1441,7 +1441,11 @@
-           kGpuStreamPriorityMedia);
- 
-   const bool enable_video_accelerator =
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+      cmd_line->HasSwitch(switches::kEnableAcceleratedVideo) &&
-+#else
-       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-+#endif
-       (gpu_channel_host->gpu_feature_info()
-            .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
-        gpu::kGpuFeatureStatusEnabled);
-Only in content/renderer: render_thread_impl.cc.orig
-diff -ur gpu/config/software_rendering_list.json chromium-69.0.3497.92/gpu/config/software_rendering_list.json
---- gpu/config/software_rendering_list.json	2018-09-12 00:39:44.000000000 +0530
-+++ gpu/config/software_rendering_list.json	2018-09-13 22:10:34.193008384 +0530
-@@ -377,17 +377,6 @@
-       ]
-     },
-     {
--      "id": 48,
--      "description": "Accelerated video decode is unavailable on Linux",
--      "cr_bugs": [137247],
--      "os": {
--        "type": "linux"
--      },
--      "features": [
--        "accelerated_video_decode"
--      ]
--    },
--    {
-       "id": 50,
-       "description": "Disable VMware software renderer on older Mesa",
-       "cr_bugs": [145531, 332596, 571899, 629434],
-diff -ur media/base/media_switches.cc chromium-69.0.3497.92/media/base/media_switches.cc
---- media/base/media_switches.cc	2018-09-12 00:39:48.000000000 +0530
-+++ media/base/media_switches.cc	2018-09-13 22:10:34.214007740 +0530
-@@ -117,10 +117,15 @@
- // accelerator hardware to be present.
- const char kUseFakeJpegDecodeAccelerator[] = "use-fake-jpeg-decode-accelerator";
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+// Enable hardware accelerated mjpeg decode on linux
-+const char kEnableAcceleratedMjpegDecode[] = "enable-accelerated-mjpeg-decode";
-+#else
- // Disable hardware acceleration of mjpeg decode for captured frame, where
- // available.
- const char kDisableAcceleratedMjpegDecode[] =
-     "disable-accelerated-mjpeg-decode";
-+#endif
- 
- // When running tests on a system without the required hardware or libraries,
- // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -462,15 +467,22 @@
- #endif
- 
- bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
-+
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-+          switches::kEnableAcceleratedMjpegDecode)
-+#else
-   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kDisableAcceleratedMjpegDecode)) {
-+          switches::kDisableAcceleratedMjpegDecode)
-+#endif
-+          ) {
-     return false;
-   }
-   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kUseFakeJpegDecodeAccelerator)) {
-     return true;
-   }
--#if defined(OS_CHROMEOS)
-+#if !defined(OS_ANDROID) && defined(OS_LINUX)
-   return true;
- #endif
-   return false;
-diff -ur media/base/media_switches.h chromium-69.0.3497.92/media/base/media_switches.h
---- media/base/media_switches.h	2018-09-12 00:39:48.000000000 +0530
-+++ media/base/media_switches.h	2018-09-13 22:10:34.283005625 +0530
-@@ -66,7 +66,11 @@
- MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
- MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
- MEDIA_EXPORT extern const char kUseFakeJpegDecodeAccelerator[];
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+MEDIA_EXPORT extern const char kEnableAcceleratedMjpegDecode[];
-+#else
- MEDIA_EXPORT extern const char kDisableAcceleratedMjpegDecode[];
-+#endif
- 
- MEDIA_EXPORT extern const char kRequireAudioHardwareForTesting[];
- MEDIA_EXPORT extern const char kMuteAudio[];
-diff -ur media/gpu/BUILD.gn chromium-69.0.3497.92/media/gpu/BUILD.gn
---- media/gpu/BUILD.gn	2018-09-12 00:39:48.000000000 +0530
-+++ media/gpu/BUILD.gn	2018-09-13 22:10:34.210007863 +0530
-@@ -495,6 +495,14 @@
-   }
- }
- 
-+if (is_desktop_linux && use_vaapi) {
-+  import("//build/config/linux/pkg_config.gni")
-+
-+  pkg_config("libva_config") {
-+    packages = [ "libva" ]
-+  }
-+}
-+
- if (use_vaapi) {
-   test("jpeg_encode_accelerator_unittest") {
-     deps = [
-@@ -559,6 +567,10 @@
-     if (use_ozone) {
-       deps += [ "//ui/ozone" ]
-     }
-+
-+    if (is_desktop_linux) {
-+      public_configs = [ ":libva_config" ]
-+    }
-   }
- }
- 
diff --git a/community/chromium/chromium-fix_harfbuzz_2.patch b/community/chromium/chromium-fix_harfbuzz_2.patch
deleted file mode 100644
index 95678c1292..0000000000
--- a/community/chromium/chromium-fix_harfbuzz_2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster@gmail.com>
-Date: Sun, 21 Oct 2018 10:06:53 -0400
-Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
- pointers
-
-This resolves a build failure against harfbuzz 2.0.
-
-Based on a patch by Alexandre Fierreira.
-
-Bug: https://bugs.gentoo.org/669034
----
- .../renderer/platform/fonts/shaping/harfbuzz_face.cc     | 2 +-
- .../renderer/platform/fonts/skia/skia_text_metrics.cc    | 9 +++++++--
- .../renderer/platform/fonts/skia/skia_text_metrics.h     | 2 +-
- 3 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
-index 8e7d91ca371f..e279a5876cb3 100644
---- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
-+++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
-@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
- static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
-                                                void* font_data,
-                                                unsigned count,
--                                               hb_codepoint_t* first_glyph,
-+                                               const hb_codepoint_t* first_glyph,
-                                                unsigned int glyph_stride,
-                                                hb_position_t* first_advance,
-                                                unsigned int advance_stride,
-diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
-index 77ec6209fab9..9f9070921448 100644
---- third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
-+++ third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
-@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
-   return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
- }
- 
-+template <class T>
-+T* advance_by_byte_size_const(T* p, unsigned byte_size) {
-+  return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
-+}
-+
- }  // namespace
- 
- SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
-@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
- }
- 
- void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
--                                               hb_codepoint_t* glyphs,
-+                                               const hb_codepoint_t* glyphs,
-                                                unsigned glyph_stride,
-                                                hb_position_t* advances,
-                                                unsigned advance_stride) {
-@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
-   // array that copy them to a regular array.
-   Vector<Glyph, 256> glyph_array(count);
-   for (unsigned i = 0; i < count;
--       i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
-+       i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
-     glyph_array[i] = *glyphs;
-   }
-   Vector<SkScalar, 256> sk_width_array(count);
-diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
-index 787d8af0375a..3bc4407c641b 100644
---- third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
-+++ third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
-@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
- 
-   void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
-   void GetGlyphWidthForHarfBuzz(unsigned count,
--                                hb_codepoint_t* first_glyph,
-+                                const hb_codepoint_t* first_glyph,
-                                 unsigned glyph_stride,
-                                 hb_position_t* first_advance,
-                                 unsigned advance_stride);
--- 
-2.19.1
-
diff --git a/community/chromium/chromium-i686-vaapi-fpermissive.patch b/community/chromium/chromium-i686-vaapi-fpermissive.patch
deleted file mode 100644
index a099f5fac5..0000000000
--- a/community/chromium/chromium-i686-vaapi-fpermissive.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- media/gpu/vaapi/BUILD.gn.i686permissive	2018-11-29 09:27:02.405909871 -0500
-+++ media/gpu/vaapi/BUILD.gn	2018-11-29 09:29:50.648259696 -0500
-@@ -10,6 +10,11 @@ import("//ui/ozone/ozone.gni")
- 
- assert(use_vaapi)
- 
-+config("vaapi_permissive") {
-+  cflags = [ "-fpermissive" ]
-+}
-+
-+
- action("libva_generate_stubs") {
-   extra_header = "va_stub_header.fragment"
- 
-@@ -98,6 +103,8 @@ source_set("vaapi") {
-     "//third_party/libyuv",
-   ]
- 
-+  configs += [ ":vaapi_permissive" ]
-+
-   if (use_x11) {
-     configs += [ "//build/config/linux:x11" ]
-     deps += [ "//ui/gfx/x" ]
diff --git a/community/chromium/chromium-skia-harmony.patch b/community/chromium/chromium-skia-harmony.patch
deleted file mode 100644
index 04e27b1216..0000000000
--- a/community/chromium/chromium-skia-harmony.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2017-10-10 17:42:06.956950985 +0200
-+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp	2017-10-10 17:46:05.824187787 +0200
-@@ -99,8 +99,6 @@
-     FreeTypeLibrary()
-         : fGetVarDesignCoordinates(nullptr)
-         , fLibrary(nullptr)
--        , fIsLCDSupported(false)
--        , fLCDExtra(0)
-     {
-         if (FT_New_Library(&gFTMemory, &fLibrary)) {
-             return;
-@@ -147,12 +145,7 @@
-         }
- #endif
- 
--        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
--        // The default has changed over time, so this doesn't mean the same thing to all users.
--        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
--            fIsLCDSupported = true;
--            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
--        }
-+        FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
-     }
-     ~FreeTypeLibrary() {
-         if (fLibrary) {
-@@ -161,8 +153,6 @@
-     }
- 
-     FT_Library library() { return fLibrary; }
--    bool isLCDSupported() { return fIsLCDSupported; }
--    int lcdExtra() { return fLCDExtra; }
- 
-     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
-     // Prior to this there was no way to get the coordinates out of the FT_Face.
-@@ -173,8 +163,6 @@
- 
- private:
-     FT_Library fLibrary;
--    bool fIsLCDSupported;
--    int fLCDExtra;
- 
-     // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
-     // The following platforms provide FreeType of at least 2.4.0.
-@@ -704,17 +692,6 @@
-         rec->fTextSize = SkIntToScalar(1 << 14);
-     }
- 
--    if (isLCD(*rec)) {
--        // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
--        SkAutoMutexAcquire ama(gFTMutex);
--        ref_ft_library();
--        if (!gFTLibrary->isLCDSupported()) {
--            // If the runtime Freetype library doesn't support LCD, disable it here.
--            rec->fMaskFormat = SkMask::kA8_Format;
--        }
--        unref_ft_library();
--    }
--
-     SkPaint::Hinting h = rec->getHinting();
-     if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
-         // collapse full->normal hinting if we're not doing LCD
-@@ -1115,11 +1092,11 @@
- void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
-     if (isLCD(fRec)) {
-         if (fLCDIsVert) {
--            glyph->fHeight += gFTLibrary->lcdExtra();
--            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
-+            glyph->fHeight += 2;
-+            glyph->fTop -= 1;
-         } else {
--            glyph->fWidth += gFTLibrary->lcdExtra();
--            glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
-+            glyph->fWidth += 2;
-+            glyph->fLeft -= 1;
-         }
-     }
- }
diff --git a/community/chromium/gcc-fno-delete-null-pointer-checks.patch b/community/chromium/gcc-fno-delete-null-pointer-checks.patch
new file mode 100644
index 0000000000..792cef60f6
--- /dev/null
+++ b/community/chromium/gcc-fno-delete-null-pointer-checks.patch
@@ -0,0 +1,19 @@
+diff --git a/v8/BUILD.gn b/v8/BUILD.gn
+index 3c03942..870b1e6 100644
+--- ./v8/BUILD.gn
++++ ./v8/BUILD.gn
+@@ -577,6 +577,14 @@ config("toolchain") {
+     defines += [ "V8_ANDROID_LOG_STDOUT" ]
+   }
+ 
++  if (!is_win && !is_clang) {
++    # GCC 6+ can optimize away pointer comparisons to null. This is
++    # problematic as V8 encodes Values through tagged pointers and comparisons
++    # with 0 are actually necessary in many cases. As a temporary Workaround
++    # we disable this optimization. See: https://crbug.com/v8/3782
++    cflags += [ "-fno-delete-null-pointer-checks" ]
++  }
++
+   # TODO(jochen): Support v8_enable_prof on Windows.
+   # TODO(jochen): Add support for compiling with simulators.
+ 
diff --git a/community/chromium/gn-bootstrap-remove-sysroot-related-options.patch b/community/chromium/gn-bootstrap-remove-sysroot-related-options.patch
deleted file mode 100644
index 9e542bce36..0000000000
--- a/community/chromium/gn-bootstrap-remove-sysroot-related-options.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-See: https://chromium.googlesource.com/chromium/src/tools/gn/+/6630c2e334d7bc179e95a3d543a8eca3201d6725%5E%21/#F0
-diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py
-index 261fddd..1945852 100755
---- tools/gn/bootstrap/bootstrap.py
-+++ tools/gn/bootstrap/bootstrap.py
-@@ -46,10 +46,6 @@
-       '--build-path',
-       help='The directory in which to build gn, '
-       'relative to the src directory. (eg. out/Release)')
--  parser.add_option(
--      '--with-sysroot',
--      action='store_true',
--      help='Download and build with the Debian sysroot.')
-   parser.add_option('-v', '--verbose', help='ignored')
-   parser.add_option(
-       '--skip-generate-buildfiles',
-@@ -76,8 +72,6 @@
-       '--no-last-commit-position',
-       '--out-path=' + gn_build_dir,
-   ]
--  if not options.with_sysroot:
--    cmd.append('--no-sysroot')
-   if options.debug:
-     cmd.append('--debug')
-   subprocess.check_call(cmd)
diff --git a/community/chromium/musl-v8-fix-deadlock.patch b/community/chromium/musl-v8-fix-deadlock.patch
new file mode 100644
index 0000000000..dff0d88d2c
--- /dev/null
+++ b/community/chromium/musl-v8-fix-deadlock.patch
@@ -0,0 +1,21 @@
+Release the mutex before mess with the stack guard
+
+Upstream report: https://bugs.chromium.org/p/v8/issues/detail?id=8881
+
+diff --git a/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc b/v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
+index 09226e1..29a1871 100644
+--- ./v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
++++ ./v8/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
+@@ -132,8 +132,10 @@ void OptimizingCompileDispatcher::CompileNext(OptimizedCompilationJob* job) {
+   // The function may have already been optimized by OSR.  Simply continue.
+   // Use a mutex to make sure that functions marked for install
+   // are always also queued.
+-  base::MutexGuard access_output_queue_(&output_queue_mutex_);
+-  output_queue_.push(job);
++  {
++    base::MutexGuard access_output_queue_(&output_queue_mutex_);
++    output_queue_.push(job);
++  }
+   isolate_->stack_guard()->RequestInstallCode();
+ }
+ 
diff --git a/community/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch b/community/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 0000000000..33a8ea32c9
--- /dev/null
+++ b/community/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,24 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
+index 5ea7083..c13027e 100644
+--- ./v8/src/base/platform/condition-variable.cc
++++ ./v8/src/base/platform/condition-variable.cc
+@@ -16,7 +16,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);