diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 4cc57c72c21654d70f9fd6c9486003dcfcb71733..c6342f5d99909c84badf0d49d6ea7a557e6f8f35 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,11 +1,12 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=chromium
-pkgver=83.0.4103.116
+pkgver=86.0.4240.111
pkgrel=0
pkgdesc="Chromium web browser"
url="https://www.chromium.org/Home"
-arch="x86_64 aarch64"
+arch="x86_64 aarch64" # x86: ./v8_context_snapshot_generator segfaults
+ # armv7: /usr/bin/ld: final link failed: memory exhausted when linking chrome
license="BSD-3-Clause"
depends="xdg-utils"
makedepends="
@@ -68,8 +69,8 @@ makedepends="
snappy-dev
speex-dev
sqlite-dev
+ xcb-proto
xdg-utils
- yasm
zlib-dev
py2-setuptools
"
@@ -107,13 +108,12 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
aarch64-fixes.patch
elf-arm.patch
- add-missing-algorithm-header.patch
- add-missing-limits-headers.patch
- add-missing-memory-headers.patch
- avoid-double-destruction-of-ServiceWorkerObjectHost.patch
- libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
- make-some-of-blink-custom-iterators-STL-comaptible.patch
- remove-unsupported-compiler-warnining.patch
+ chromium-size_t-defined.patch
+ check-for-enable-accelerated-video-decode-on-Linux.patch
+ fix-invalid-end-iterator-usage-in-CookieMonster.patch
+ only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
+ remove-dead-reloc-in-nonalloc-LD-flags.patch
+ xproto-fix-underflow-in-Fp1616ToDouble.patch
"
# secfixes:
@@ -163,7 +163,6 @@ prepare() {
opus
re2
snappy
- yasm
"
for _lib in $use_system libjpeg_turbo; do
msg "Removing buildscripts for system provided $_lib"
@@ -174,7 +173,6 @@ prepare() {
\! -path './third_party/libxml/*' \
\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
\! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
- \! -path './third_party/yasm/run_yasm.py' \
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-delete
done
@@ -183,6 +181,7 @@ prepare() {
python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
$use_system
third_party/libaddressinput/chromium/tools/update-strings.py
+
}
_gn_flags() {
@@ -202,7 +201,6 @@ build() {
use_sysroot=false \
treat_warnings_as_errors=false \
fatal_linker_warnings=false \
- binutils_path=\"/usr/bin\" \
use_custom_libcxx=false \
use_gold=false \
use_allocator=\"none\" \
@@ -256,12 +254,21 @@ build() {
AR="ar" CC="clang" CXX="clang++" LD="clang++" NM=/usr/bin/nm \
out/Release/gn gen out/$_buildtype --args="$_c $_ca"
+ # Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2
+ ln -sf /usr/lib/python3.*/site-packages/xcbgen .
+ export PYTHONPATH="$PWD"
+
msg "Ninja turtles GO!"
# build mksnapshot
ninja -C out/$_buildtype mksnapshot
ninja -C out/$_buildtype v8_context_snapshot_generator
+ if [ "$CARCH" = "x86" ]; then
+ # x86 only - dependency issues compiling obj/chrome/browser/devtools/devtools/cast_handler.o
+ ninja -C out/$_buildtype obj/chrome/common/media_router/mojom/media_router__generator.stamp
+ fi
+
# final link needs lots of file descriptors
ulimit -n 2048
@@ -328,23 +335,23 @@ chromedriver() {
mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin
}
-sha512sums="dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f chromium-83.0.4103.116.tar.xz
+sha512sums="809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54 chromium-86.0.4240.111.tar.xz
a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29 pstables-2.8.h
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf
e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop
2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys
b726ef2ecfe7d471e60d67de1e05847d214df6093b41bb2055652a9028327af19a8b10e7175467240f4dfec9e3ae97a6c4666bfd2cd6cb436c54656a085653ae default-pthread-stacksize.patch
-1d815644101b9d8892964ed5c683773b35a195d0635ad628936ad0e9f879abfc39a1f4d8ef11b9783ed0eec404c5103f9935250d3108433682a9f51c74cd40ba musl-fixes.patch
-893211a39e5b5b2e1dabcac9b232d34c6048304b706029ebb25023718a1c73d9afd889e811002351befa9db5f3b4814b25c5911a3230a9729696e2b15f2bf35b musl-fixes-breakpad.patch
-d78479bdea1c847d6e1506421a3eb716031cd24aa979f0e653c0406b507a5a89924d15e6c603e291f1b17751fb0788571f42699214fd1462334c0daabd584ffe musl-hacks.patch
+4620f7515717eb185339af1f52f40e5c6ccd15b9162986517eb5cf3cbaf29740134f520997e2a1337ea51fd69dc0354b297f6cc4d1555ed546ffdc1dbcb51f5c musl-fixes.patch
+e8675aff9fccd8b58cc839ef1d9e0e022d66aa94f72baa72e7acf92ceb2691f6a7907cc60ec3a87f894efdd639a3dec7fe702c97d446fcdea99452caec57e002 musl-fixes-breakpad.patch
+ddacc7ab0374eaa110a392c9d0912c250eb102f060cac284b170902fa9358f8670cbe26676582208d1291662058761e31795ebac75115b38a1e3ad8681895b38 musl-hacks.patch
919f13a2cd65673f267321cf95c5410e65bc5264d6704d0791b25d39111282bedb425bd9824dde3b67422cfb874c86a9383ded686e39cfd4aac239edaf41cfc8 musl-libc++.patch
-8d57d524978852ded41394793d611083d82241ecbc64808bbf5759d7bf0db0fe92af84935cf9e556d555f8d9963c847611413fa68634202f817b671be414c224 musl-sandbox.patch
+ef43fa90b05e2407b6daa822193121cdeef6ee9068175572f0928f156f186be9c77539dfa06863adfaa25afd498ec1b5081f9e476543616f9472b9033fd921dc musl-sandbox.patch
129ec746fd951ee6d0bf0b4389b7c988523870507de1f92f5706f4eb49039d4a49ed30e92b0634e3ae521fc3e129adc1c6edc7435922fc91658d8c087520c707 no-execinfo.patch
06d6b4c466fa48f2d22c338e20458d8fa50bbbf744468f41bc3c1892e739002b1fbc5c133a37252cec4ff4f804847add6b9c0cc1f84fb276939471c09e467fb6 no-mallinfo.patch
-b1edab2a782a0fd554d0fcee893374282ceca797e9595f1b4dd1c4dbeb65a5d6c368f2000f8d44baea3a53880621fa33c456b663d72960e94f2e05f9ec4f7965 resolver.patch
+f60c89076bbc458e2e38d9dad26027f9604179fd59e0c2b988a86340b9ef78a4c346c84ac3e7e4e70badaff69d71edf49d7b9030e5fadb96afde4f977a98c412 resolver.patch
f4265df7532625070c51ac43466e3e0f21e696f90c3b6040ef62a21defa7666203ff8219d9c9a5bebc011024aff300fbcbd941cebd0df59c4bc068d8f290221e swiftshader.patch
-e2b5b6f848c0fcb9ea7c932be0afef65a89328c4425843b670d9d80440946ba1cf4eeb08eebbbe700d8514e5075664660da9f8368e5f0deec582a95d4cd2b07a create-extra-view-redefinition.patch
+5b88c065819a44684ceea87239320f8120cfde0dc2f6dd739a007488dea6608c11584c56f3876a062641c9ca6fa82f43877c547ad470766aec31f5151bb2bdc1 create-extra-view-redefinition.patch
cf9970ef403ff7a68bf08c0ba5e681eec459fcb1afb6859e5a80f4874f1b9a656377b4540eeb5208ddec570efa206f147e32718c687fa29ca3acc4fde6e8cbe8 chromium-use-alpine-target.patch
599f5ef338b5797e04436bdc88921c31365d2dea2613d40053be6e774f654e2889efb0c0bd55c2c5044a6805510fbc337da555971169a75d584fac93e18256ac media-base.patch
2e5a83826239849d096aead033eb519338b84e6fbbf58abfcd7cfe40d0b3070b66bcc825ec84406484d73d1a333f1b9d23a8ab44987ab5c8b187076c84cd668b musl-crashpad.patch
@@ -352,12 +359,11 @@ cf9970ef403ff7a68bf08c0ba5e681eec459fcb1afb6859e5a80f4874f1b9a656377b4540eeb5208
7957aae04e8ef3badbc98c982ba1acb1b9ef5e665440116c704512f11554d7b64ba3643b7ff7d00476a6686324033b0cf762deb78ce798619226380953b9dc9c nasm.patch
56a357668c0928bc488ccec8f53fd37fccbaefe0a185ceaf067c8c39e0fae3d2b61ca010ccabc785bec0f2e86b19f37cebb3ac344225aa8d7651c822e48c6064 gcc-fno-delete-null-pointer-checks.patch
ad4ddc25df7aa1de2038b7adb86d27679ecdb7e3e16c0eec994e947a08c41504b6fb41166f7868ff5f58ce8191c78800cbb91d259c864840fa5af1d7ba5d43a1 gcc-arm.patch
-7f81d97cce25d5530a2cb84105247e3707e344a285b0ac73c2f9275eae4bcc5aea6ff27307ec6607f95c13e9e724fab0e15e6fb8a33b3a9bfe0b3dbfdfb33ae6 aarch64-fixes.patch
+cc67d2a77910663e5a1ad5f66606ee2544867aa1fef25e1a1bc355a8db765d5928edb72f158e6a2ece4195c9b62b875dcdcab4e4055e7611edab405e8cfd658e aarch64-fixes.patch
9b1441fe42421ef9ead86a5143bf997d989bd53a8969cdfdf4e0c45f847efc8c1d127e15fb05e2ef5dbefbb228cbdc2849404d74997ca56265599e12e5efd6e4 elf-arm.patch
-362e08911220e62945748cbd9f078df087f26737258f7fea023c0d256a0a353a44de2fc9942684d7632b903f4c1a2f89dc90fb43e12717a5495e67d8972fa03b add-missing-algorithm-header.patch
-b64e03d9bf1f6488f183b103abfd175bc7c3805be81c037281b4cad8ae698d462b15bef7ffb938098ad183e01553ce34de4050d20fc49cacb68eb40581f4ebb4 add-missing-limits-headers.patch
-15c52f53ae96e43235cac4e530f76f8ec4a30e984f5b8b22d48f779952040f738c3b115aec6f4a30a7d8dd8a9a74400797d3145812a335db146756c5edf05872 add-missing-memory-headers.patch
-2a480de85c257a9ef151301dbb0aa76b0a4ef9ca9b5c597e97064567e4f40a54eb3404376b84ad995dbdaf48bf4687c7b8375425552ec5ab78551673f9aec33f avoid-double-destruction-of-ServiceWorkerObjectHost.patch
-469e8ccbe840ed0602236ddb49ee4c92dd40179ce42bb58f820392bc5b77a93e29a2169dccd6e81d4f703dfeb557e10314ad081aab83ec0c1f009dabb13e997e libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
-4133aad3a714a249dcdf9958d27823f1ddcebd4883443e0f81a50320525e9b4e8f7db0d75f7d55f05d120b5dda3314769e6a9b48f974bfa7ea4eaa13331d0048 make-some-of-blink-custom-iterators-STL-comaptible.patch
-7bb86c213149ce15ccf46bff93f6efe23415febe312d98a662180c71161a0fb9737ba47707d4433a70e5329919416759c35c050a3d00240fd004111d981383d0 remove-unsupported-compiler-warnining.patch"
+17ed804782df7161e58cb1c125b2cdee22a63008a240da6d3409a7b7a356dc4bd5971aa61217b7aefcfa130e3e12a753bc0fe96882cde842917cf5d6df46083f chromium-size_t-defined.patch
+6bda2c9d622a77d50832b56c36239a2d79eb8dce7825e9cf99b82132d0a6e58ba23e253ec1a71cf6600111afe4c0917d26ba54ab1b6d7ceea5d57bb8e5f8e4c1 check-for-enable-accelerated-video-decode-on-Linux.patch
+a239bb09ea79875d821a53f8769ef19997c60012dc474139a21f6818a031e77fe16aed6dee9fb8b9fd9411bbaf9901f674de480012badae51ff17e9bea35fd70 fix-invalid-end-iterator-usage-in-CookieMonster.patch
+a8088aea5e27723b34bec232406a743f93cf4ebcaa7b48bda1669d8a8fbc3083eec4d3921c2ab1e002eb443f74205c7f1e73cd0bb303fa20f0f1a1f255dcbdcb only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
+862fbd405a06e570891d84634a3aff943f0eb1458308211d7ac98d84a9f57c779deba7e91e4b1efbbce15a8b14734dc86ed625165bf3ce8d31ef67d26ba7cecf remove-dead-reloc-in-nonalloc-LD-flags.patch
+b425d6ab3da04b6a8d32303d1c39feb9c1be813fac9b38eb53fd5d020ff08b4b3e247897d5b5c5dac3a7a213c5d3eaf3ea2342c97d22089f2c623e28a124f00d xproto-fix-underflow-in-Fp1616ToDouble.patch"
diff --git a/community/chromium/aarch64-fixes.patch b/community/chromium/aarch64-fixes.patch
index b35347da03badb4b5f18692fa04d547c9c6b324e..f0a73b6bfacef53925d77ead22e62f1c25b6683e 100644
--- a/community/chromium/aarch64-fixes.patch
+++ b/community/chromium/aarch64-fixes.patch
@@ -1,11 +1,11 @@
---- ./third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-+++ ./third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-@@ -122,7 +122,7 @@
+--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
++++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
+@@ -125,7 +125,7 @@
/* #undef HAVE_MALLCTL */
/* Define to 1 if you have the `mallinfo' function. */
-#define HAVE_MALLINFO 1
+// #define HAVE_MALLINFO 1
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
+ /* Define to 1 if you have the <malloc/malloc.h> header file. */
+ /* #undef HAVE_MALLOC_MALLOC_H */
diff --git a/community/chromium/check-for-enable-accelerated-video-decode-on-Linux.patch b/community/chromium/check-for-enable-accelerated-video-decode-on-Linux.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e7d05e84b04fa79f92dfc0bdda8770d0669b9630
--- /dev/null
+++ b/community/chromium/check-for-enable-accelerated-video-decode-on-Linux.patch
@@ -0,0 +1,43 @@
+From 54deb9811ca9bd2327def5c05ba6987b8c7a0897 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Tue, 29 Sep 2020 01:02:22 +0000
+Subject: [PATCH] Check for enable-accelerated-video-decode on Linux
+
+Video decoding was being accelerated on Linux even though the newly
+added "enable-accelerated-video-decode" flag was not specified. The
+chrome://gpu page was misleadingly showing this feature as disabled:
+
+ > Video Decode: Software only. Hardware acceleration disabled
+
+This change adds a check for --enable-accelerated-video-decode when
+considering if video decoding should be activated. (Only on Linux.)
+
+Extra context: https://crbug.com/1097029#c18 (and also comment 20).
+
+Bug: 1066176, 1097029
+Change-Id: I534115f5f6ceed0ee3511fcf5c2d0f1dd04b9b7e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431434
+Reviewed-by: John Abd-El-Malek <jam@chromium.org>
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#811480}
+---
+ content/renderer/render_thread_impl.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
+index f13c94ddab7..0352f127171 100644
+--- content/renderer/render_thread_impl.cc
++++ content/renderer/render_thread_impl.cc
+@@ -1121,7 +1121,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {
+ kGpuStreamPriorityMedia);
+
+ const bool enable_video_accelerator =
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++ cmd_line->HasSwitch(switches::kEnableAcceleratedVideoDecode) &&
++#else
+ !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
++#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ (gpu_channel_host->gpu_feature_info()
+ .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] ==
+ gpu::kGpuFeatureStatusEnabled);
diff --git a/community/chromium/chromium-size_t-defined.patch b/community/chromium/chromium-size_t-defined.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e1e1de64c511e4a523f8dceec39d6d5e2e87c31e
--- /dev/null
+++ b/community/chromium/chromium-size_t-defined.patch
@@ -0,0 +1,31 @@
+Reason: Fixes:
+../../third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h:34:3: error: unknown type name 'size_t'; did you mean 'std::size_t'?
+ size_t stability_counter_;
+ ^~~~~~
+ std::size_t
+/usr/bin/../lib/gcc/x86_64-alpine-linux-musl/10.2.0/../../../../include/c++/10.2.0/x86_64-alpine-linux-musl/bits/c++config.h:260:26: note: 'std::size_t' declared here
+ typedef __SIZE_TYPE__ size_t;
+ ^
+1 error generated.
+Upstream: No
+
+--- third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h.orig 2020-08-23 12:43:09.289768089 +0200
++++ third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-23 12:43:39.386217911 +0200
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+
+ #include <array>
++#include <stddef.h>
+
+ namespace webrtc {
+
+--- chrome/browser/search/background/ntp_backgrounds.h.orig 2020-08-23 14:35:40.788447650 +0200
++++ chrome/browser/search/background/ntp_backgrounds.h 2020-08-23 14:36:16.414865836 +0200
+@@ -6,6 +6,7 @@
+ #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
+
+ #include <array>
++#include <stddef.h>
+
+ class GURL;
+
diff --git a/community/chromium/create-extra-view-redefinition.patch b/community/chromium/create-extra-view-redefinition.patch
index 99361145dbc07af79b6481416a777c2884d62bf1..afb10572b990ff3abd4ad3b2a02ce35e46e2ee31 100644
--- a/community/chromium/create-extra-view-redefinition.patch
+++ b/community/chromium/create-extra-view-redefinition.patch
@@ -9,12 +9,12 @@
auto learn_more = views::CreateVectorImageButtonWithNativeTheme(
listener, vector_icons::kHelpOutlineIcon);
learn_more->SetTooltipText(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
-@@ -86,7 +86,7 @@
- DialogDelegate::SetButtons(ui::DIALOG_BUTTON_OK);
- DialogDelegate::SetButtonLabel(ui::DIALOG_BUTTON_OK,
- l10n_util::GetStringUTF16(IDS_DONE));
-- DialogDelegate::SetExtraView(::CreateExtraView(this));
-+ DialogDelegate::SetExtraView(::CreateExtraViewInternal(this));
+@@ -85,7 +85,7 @@
+ browser_(browser) {
+ SetButtons(ui::DIALOG_BUTTON_OK);
+ SetButtonLabel(ui::DIALOG_BUTTON_OK, l10n_util::GetStringUTF16(IDS_DONE));
+- SetExtraView(::CreateExtraView(this));
++ SetExtraView(::CreateExtraViewInternal(this));
set_margins(gfx::Insets());
chrome::RecordDialogCreation(chrome::DialogIdentifier::INVERT);
}
diff --git a/community/chromium/fix-invalid-end-iterator-usage-in-CookieMonster.patch b/community/chromium/fix-invalid-end-iterator-usage-in-CookieMonster.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7494dc9b7c37129b23fb8c754715368068c6a216
--- /dev/null
+++ b/community/chromium/fix-invalid-end-iterator-usage-in-CookieMonster.patch
@@ -0,0 +1,78 @@
+From 53478caee862624fc6d73516f8d64253854b146f Mon Sep 17 00:00:00 2001
+From: Piotr Tworek <ptworek@vewd.com>
+Date: Mon, 31 Aug 2020 21:03:58 +0000
+Subject: [PATCH] Fix invalid "end" iterator usage in CookieMonster.
+
+Commit 229623d76e8baf714c8569c9f4efc5de266cef8b has introduced the following
+code in cookie_monster.cc.
+
+// If this is the first cookie in |cookies_| with this key, increment the
+// |num_keys_| counter.
+bool different_prev =
+ inserted == cookies_.begin() || std::prev(inserted)->first != key;
+bool different_next =
+ inserted == cookies_.end() || std::next(inserted)->first != key;
+if (different_prev && different_next)
+ ++num_keys_;
+
+The "inserted" iterator is something that has been returned from
+std::multimap::insert. At first glance it looks reasonable. The code
+tries to determine if there are already similar elements with the same
+key in the map. Unfortunately the expression calculating the value of
+different_next can potentially use the end iterator to the map. The
+"inserted == cookies_.end()" part of the expression will always evaluate
+to false since the newly inserted element has to be in the map and
+cookies_.end() points to the first element outside the map. If the
+inserted happens to be the last element in the map the second part of
+the expression will grab the end iterator by calling std::next(inserted)
+and then will try to use it leading to invalid memory access.
+
+Given the fact that cookies_ is a std::multimap we should not even need
+to calculate the value of different_next. It should always be true.
+
+ "If the container has elements with equivalent key, inserts at the
+ upper bound of that range.(since C++11)"
+
+See: https://en.cppreference.com/w/cpp/container/multimap/insert
+
+Bug: 1120240
+Change-Id: I8928c294ac4daf72349a2331b31b017c1d015da0
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368872
+Reviewed-by: Maksim Orlovich <morlovich@chromium.org>
+Commit-Queue: Piotr Tworek <ptworek@vewd.com>
+Cr-Commit-Position: refs/heads/master@{#803260}
+---
+ net/cookies/cookie_monster.cc | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
+index 265deed0e52..140b61a81dc 100644
+--- net/cookies/cookie_monster.cc
++++ net/cookies/cookie_monster.cc
+@@ -1151,9 +1151,14 @@ CookieMonster::CookieMap::iterator CookieMonster::InternalInsertCookie(
+ // |num_keys_| counter.
+ bool different_prev =
+ inserted == cookies_.begin() || std::prev(inserted)->first != key;
+- bool different_next =
+- inserted == cookies_.end() || std::next(inserted)->first != key;
+- if (different_prev && different_next)
++ // According to std::multiqueue documentation:
++ // "If the container has elements with equivalent key, inserts at the upper
++ // bound of that range. (since C++11)"
++ // This means that "inserted" iterator either points to the last element in
++ // the map, or the element succeeding it has to have different key.
++ DCHECK(std::next(inserted) == cookies_.end() ||
++ std::next(inserted)->first != key);
++ if (different_prev)
+ ++num_keys_;
+
+ return inserted;
+@@ -1381,7 +1386,7 @@ void CookieMonster::InternalDeleteCookie(CookieMap::iterator it,
+ bool different_prev =
+ it == cookies_.begin() || std::prev(it)->first != it->first;
+ bool different_next =
+- it == cookies_.end() || std::next(it)->first != it->first;
++ std::next(it) == cookies_.end() || std::next(it)->first != it->first;
+ if (different_prev && different_next)
+ --num_keys_;
+
diff --git a/community/chromium/musl-fixes-breakpad.patch b/community/chromium/musl-fixes-breakpad.patch
index 886bde71d0b2d6720286c7c7d6519f840e642ff2..71c1e9122ed81c6f86aba2b6363a9642d84234a5 100644
--- a/community/chromium/musl-fixes-breakpad.patch
+++ b/community/chromium/musl-fixes-breakpad.patch
@@ -1,34 +1,3 @@
---- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -49,7 +49,7 @@
- }
-
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-- const struct _libc_fpstate* fp) {
-+ const struct _fpstate* fp) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
- out->context_flags = MD_CONTEXT_X86_FULL |
-@@ -97,7 +97,7 @@
- }
-
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-- const struct _libc_fpstate* fpregs) {
-+ const struct _fpstate* fpregs) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
- out->context_flags = MD_CONTEXT_AMD64_FULL;
---- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -50,7 +50,7 @@
- // info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
- static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-- const struct _libc_fpstate* fp);
-+ const struct _fpstate* fp);
- #elif defined(__aarch64__)
- static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs);
--- ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+++ ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
@@ -490,7 +490,9 @@
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch
index 161e24c55a7bb680719fd878e746e8af0d80af7b..8699ba981ad59a71d33ed0615a4b9d63cd98bef3 100644
--- a/community/chromium/musl-fixes.patch
+++ b/community/chromium/musl-fixes.patch
@@ -1,6 +1,6 @@
--- ./third_party/lss/linux_syscall_support.h.orig
+++ ./third_party/lss/linux_syscall_support.h
-@@ -139,11 +139,13 @@
+@@ -139,12 +139,14 @@
*/
#pragma push_macro("stat64")
#pragma push_macro("fstat64")
@@ -8,15 +8,16 @@
#pragma push_macro("lstat64")
#pragma push_macro("pread64")
#pragma push_macro("pwrite64")
+ #pragma push_macro("getdents64")
#undef stat64
#undef fstat64
+#undef fstatat64
#undef lstat64
#undef pread64
#undef pwrite64
-@@ -1244,6 +1246,12 @@
- #ifndef __NR_fallocate
- #define __NR_fallocate 285
+@@ -1258,6 +1260,12 @@
+ #ifndef __NR_getrandom
+ #define __NR_getrandom 318
#endif
+
+#undef __NR_pread
@@ -27,7 +28,7 @@
/* End of x86-64 definitions */
#elif defined(__mips__)
#if _MIPS_SIM == _MIPS_SIM_ABI32
-@@ -4520,6 +4528,7 @@
+@@ -4545,6 +4553,7 @@
* corresponding #pragma push_macro near the top of this file. */
#pragma pop_macro("stat64")
#pragma pop_macro("fstat64")
@@ -35,52 +36,7 @@
#pragma pop_macro("lstat64")
#pragma pop_macro("pread64")
#pragma pop_macro("pwrite64")
---- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.orig
-+++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -37,6 +37,10 @@
- #include "common/memory.h"
- #include "google_breakpad/common/minidump_format.h"
-
-+#if !defined(__GLIBC__)
-+ #define _libc_fpstate _fpstate
-+#endif
-+
- namespace google_breakpad {
-
- // Wraps platform-dependent implementations of accessors to ucontext_t structs.
---- ./third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h.orig
-+++ ./third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -48,7 +48,7 @@
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
--typedef struct _libc_fpstate fpstate_t;
-+typedef struct _fpstate fpstate_t;
- #endif
-
- // These entries store a list of memory regions that the client wants included
---- ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h.orig
-+++ ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-@@ -36,6 +36,7 @@
- #include <elf.h>
- #include <link.h>
- #include <stddef.h>
-+#include <limits.h>
-
- #include "common/memory_range.h"
-
-@@ -51,9 +52,9 @@
- typedef ElfW(Phdr) Phdr;
- typedef ElfW(Word) Word;
- typedef ElfW(Addr) Addr;
--#if __WORDSIZE == 32
-+#if ULONG_MAX == 0xffffffff
- static const int kClass = ELFCLASS32;
--#elif __WORDSIZE == 64
-+#elif ULONG_MAX == 0xffffffffffffffff
- static const int kClass = ELFCLASS64;
- #else
- #error "Unsupported __WORDSIZE for ElfCoreDump."
+
--- ./sandbox/linux/suid/process_util.h.orig
+++ ./sandbox/linux/suid/process_util.h
@@ -11,6 +11,14 @@
@@ -141,16 +97,6 @@ diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b
base::Version version(gnu_get_libc_version());
UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
---- services/device/serial/serial_io_handler_posix.cc.orig 2019-07-03 10:57:32.568171835 -0400
-+++ services/device/serial/serial_io_handler_posix.cc 2019-07-03 10:57:16.867983031 -0400
-@@ -6,6 +6,7 @@
-
- #include <sys/ioctl.h>
- #include <termios.h>
-+#include <asm-generic/ioctls.h>
-
- #include <algorithm>
- #include <utility>
diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
--- third_party/ots/include/opentype-sanitiser.h
+++ third_party/ots/include/opentype-sanitiser.h
@@ -235,3 +181,15 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
/*
* GNU-specific, but avoids the realpath(..., NULL)
+diff --git a/mojo/public/cpp/platform/named_platform_channel_posix.cc ./mojo/public/cpp/platform/named_platform_channel_posix.cc
+index 9082ac4..cbedae6 100644
+--- a/mojo/public/cpp/platform/named_platform_channel_posix.cc
++++ ./mojo/public/cpp/platform/named_platform_channel_posix.cc
+@@ -5,6 +5,7 @@
+ #include "mojo/public/cpp/platform/named_platform_channel.h"
+
+ #include <errno.h>
++#include <string.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/community/chromium/musl-hacks.patch b/community/chromium/musl-hacks.patch
index 45d938b78fda96b6dc2dfcb7b590c48dffbc44f6..b5373f1e964bdfa21e4d773d48ae100a4f2d8234 100644
--- a/community/chromium/musl-hacks.patch
+++ b/community/chromium/musl-hacks.patch
@@ -20,15 +20,3 @@
int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
SendResult send_result(0, 0, std::move(buffers));
if (result < 0) {
-diff --git a/chrome/common/string_matching/fuzzy_tokenized_string_match.cc b/chrome/common/string_matching/fuzzy_tokenized_string_match.cc
-index 8351fa7..7ace813 100644
---- ./chrome/common/string_matching/fuzzy_tokenized_string_match.cc
-+++ ./chrome/common/string_matching/fuzzy_tokenized_string_match.cc
-@@ -6,6 +6,7 @@
-
- #include <algorithm>
- #include <iterator>
-+#include <cmath>
-
- #include "base/i18n/case_conversion.h"
- #include "base/metrics/field_trial_params.h"
diff --git a/community/chromium/musl-sandbox.patch b/community/chromium/musl-sandbox.patch
index 71af19fb88df40eece6cab868efbfd83480e944e..4fe0098cd2b0d50b6f2303af569b8d69f0001a78 100644
--- a/community/chromium/musl-sandbox.patch
+++ b/community/chromium/musl-sandbox.patch
@@ -1,6 +1,8 @@
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+index ff5a1c0..da56b9b 100644
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@
+@@ -139,21 +139,11 @@ namespace sandbox {
// present (as in newer versions of posix_spawn).
ResultExpr RestrictCloneToThreadsAndEPERMFork() {
const Arg<unsigned long> flags(0);
@@ -27,7 +29,7 @@
// The following two flags are the two important flags in any vfork-emulating
// clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@
+@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
(flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
@@ -36,9 +38,11 @@
.ElseIf(is_fork_or_clone_vfork, Error(EPERM))
.Else(CrashSIGSYSClone());
}
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+index d9d1882..0567557 100644
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -392,6 +392,7 @@
+@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
#if defined(__i386__)
case __NR_waitpid:
#endif
@@ -46,7 +50,7 @@
return true;
case __NR_clone: // Should be parameter-restricted.
case __NR_setns: // Privileged.
-@@ -404,7 +405,6 @@
+@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
case __NR_set_thread_area:
#endif
@@ -54,7 +58,7 @@
case __NR_unshare:
#if !defined(__mips__) && !defined(__aarch64__)
case __NR_vfork:
-@@ -514,6 +514,8 @@
+@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
case __NR_mlock:
case __NR_munlock:
case __NR_munmap:
@@ -63,7 +67,7 @@
return true;
case __NR_madvise:
case __NR_mincore:
-@@ -531,7 +533,6 @@
+@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
case __NR_modify_ldt:
#endif
case __NR_mprotect:
@@ -71,7 +75,9 @@
case __NR_msync:
case __NR_munlockall:
case __NR_readahead:
---- ./sandbox/linux/system_headers/arm64_linux_syscalls.h
+diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h ./sandbox/linux/system_headers/arm64_linux_syscalls.h
+index 59d0eab..7ae7002 100644
+--- a/sandbox/linux/system_headers/arm64_linux_syscalls.h
+++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h
@@ -1063,4 +1063,8 @@
#define __NR_memfd_create 279
@@ -82,7 +88,9 @@
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
---- ./sandbox/linux/system_headers/arm_linux_syscalls.h
+diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h ./sandbox/linux/system_headers/arm_linux_syscalls.h
+index 1addd53..7843b5e 100644
+--- a/sandbox/linux/system_headers/arm_linux_syscalls.h
+++ ./sandbox/linux/system_headers/arm_linux_syscalls.h
@@ -1385,6 +1385,10 @@
#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
@@ -95,7 +103,21 @@
// ARM private syscalls.
#if !defined(__ARM_NR_BASE)
#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
---- ./sandbox/linux/system_headers/mips64_linux_syscalls.h
+diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h
+index 2b78a0c..b6fedb5 100644
+--- a/sandbox/linux/system_headers/linux_syscalls.h
++++ ./sandbox/linux/system_headers/linux_syscalls.h
+@@ -10,6 +10,7 @@
+ #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+
+ #include "build/build_config.h"
++#include <sys/syscall.h>
+
+ #if defined(__x86_64__)
+ #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
+diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h ./sandbox/linux/system_headers/mips64_linux_syscalls.h
+index ec75815..5515270 100644
+--- a/sandbox/linux/system_headers/mips64_linux_syscalls.h
+++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h
@@ -1271,4 +1271,8 @@
#define __NR_memfd_create (__NR_Linux + 314)
@@ -106,7 +128,9 @@
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
---- ./sandbox/linux/system_headers/mips_linux_syscalls.h
+diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h ./sandbox/linux/system_headers/mips_linux_syscalls.h
+index ddbf97f..ad3d64b 100644
+--- a/sandbox/linux/system_headers/mips_linux_syscalls.h
+++ ./sandbox/linux/system_headers/mips_linux_syscalls.h
@@ -1433,4 +1433,8 @@
#define __NR_memfd_create (__NR_Linux + 354)
@@ -117,10 +141,12 @@
+#endif
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
---- ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
+diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
+index b0ae0a2..8b12029 100644
+--- a/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
+@@ -1350,5 +1350,9 @@
+ #define __NR_rseq 334
#endif
+#if !defined(__NR_membarrier)
@@ -129,9 +155,11 @@
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
---- ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -88,10 +88,10 @@
+diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
+index a85c0ea..715aa1e 100644
+--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ ./sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -93,11 +93,11 @@
case __NR_sysinfo:
case __NR_times:
case __NR_uname:
@@ -139,20 +167,10 @@
- case __NR_sched_getaffinity:
case __NR_sched_getparam:
case __NR_sched_getscheduler:
+ case __NR_sched_setscheduler:
+ return Allow();
+ case __NR_sched_getaffinity:
- case __NR_sched_setscheduler:
- return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
+ return RestrictSchedTarget(GetPolicyPid(), sysno);
case __NR_prlimit64:
-diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h
-index 2b78a0c..b6fedb5 100644
---- ./sandbox/linux/system_headers/linux_syscalls.h
-+++ ./sandbox/linux/system_headers/linux_syscalls.h
-@@ -10,6 +10,7 @@
- #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
-
- #include "build/build_config.h"
-+#include <sys/syscall.h>
-
- #if defined(__x86_64__)
- #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
+ // See crbug.com/662450 and setrlimit comment above.
+
diff --git a/community/chromium/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch b/community/chromium/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5c517e4a8ebb8f21b429264007e83596351d0dd9
--- /dev/null
+++ b/community/chromium/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
@@ -0,0 +1,139 @@
+From fbd756ab55f9351165f923b0411c31dd71319c78 Mon Sep 17 00:00:00 2001
+From: Ted Meyer <tmathmeyer@chromium.org>
+Date: Wed, 16 Sep 2020 17:42:03 +0000
+Subject: [PATCH] Only fall back to the i965 driver if we're on iHD
+
+I got my hands on an old AMD laptop, and the gallium driver worked very
+well and was saving power even at 720p, so there's no reason to block
+that for now.
+
+Bug: 1116703
+Change-Id: Ib15bc2b93f33e99adad7569dd825e167b503a0ea
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409967
+Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
+Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#807550}
+---
+ media/gpu/vaapi/vaapi_wrapper.cc | 73 ++++++++++++++++++++------------
+ 1 file changed, 47 insertions(+), 26 deletions(-)
+
+diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
+index 2ad0b997e56..e30d1dfb73b 100644
+--- media/gpu/vaapi/vaapi_wrapper.cc
++++ media/gpu/vaapi/vaapi_wrapper.cc
+@@ -409,6 +409,8 @@ class VADisplayState {
+
+ // Implementation of Initialize() called only once.
+ bool InitializeOnce() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
++ bool InitializeVaDisplay_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
++ bool InitializeVaDriver_Locked() EXCLUSIVE_LOCKS_REQUIRED(va_lock_);
+
+ int refcount_ GUARDED_BY(va_lock_);
+
+@@ -472,11 +474,7 @@ bool VADisplayState::Initialize() {
+ return success;
+ }
+
+-bool VADisplayState::InitializeOnce() {
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
+-
++bool VADisplayState::InitializeVaDisplay_Locked() {
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationEGLGLES2:
+ va_display_ = vaGetDisplayDRM(drm_fd_.get());
+@@ -519,25 +517,10 @@ bool VADisplayState::InitializeOnce() {
+ return false;
+ }
+
+- // Set VA logging level and driver name, unless already set.
+- constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
+- std::unique_ptr<base::Environment> env(base::Environment::Create());
+- if (!env->HasVar(libva_log_level_env))
+- env->SetVar(libva_log_level_env, "1");
+-
+-#if defined(USE_X11)
+- if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE) {
+- DCHECK(!features::IsUsingOzonePlatform());
+- constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
+- // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
+- // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
+- // is discussion of the issue here:
+- // https://github.com/intel/media-driver/issues/818
+- if (!env->HasVar(libva_driver_impl_env))
+- env->SetVar(libva_driver_impl_env, "i965");
+- }
+-#endif // USE_X11
++ return true;
++}
+
++bool VADisplayState::InitializeVaDriver_Locked() {
+ // The VAAPI version.
+ int major_version, minor_version;
+ VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
+@@ -545,9 +528,6 @@ bool VADisplayState::InitializeOnce() {
+ LOG(ERROR) << "vaInitialize failed: " << vaErrorStr(va_res);
+ return false;
+ }
+-
+- va_initialized_ = true;
+-
+ const std::string va_vendor_string = vaQueryVendorString(va_display_);
+ DLOG_IF(WARNING, va_vendor_string.empty())
+ << "Vendor string empty or error reading.";
+@@ -555,6 +535,8 @@ bool VADisplayState::InitializeOnce() {
+ << va_vendor_string;
+ implementation_type_ = VendorStringToImplementationType(va_vendor_string);
+
++ va_initialized_ = true;
++
+ // The VAAPI version is determined from what is loaded on the system by
+ // calling vaInitialize(). Since the libva is now ABI-compatible, relax the
+ // version check which helps in upgrading the libva, without breaking any
+@@ -571,6 +553,45 @@ bool VADisplayState::InitializeOnce() {
+ return true;
+ }
+
++bool VADisplayState::InitializeOnce() {
++ static_assert(
++ VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
++ "Requires VA-API >= 1.1.0");
++
++ // Set VA logging level, unless already set.
++ constexpr char libva_log_level_env[] = "LIBVA_MESSAGING_LEVEL";
++ std::unique_ptr<base::Environment> env(base::Environment::Create());
++ if (!env->HasVar(libva_log_level_env))
++ env->SetVar(libva_log_level_env, "1");
++
++ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
++ return false;
++
++#if defined(USE_X11)
++ if (gl::GetGLImplementation() == gl::kGLImplementationEGLANGLE &&
++ implementation_type_ == VAImplementation::kIntelIHD) {
++ DCHECK(!features::IsUsingOzonePlatform());
++ constexpr char libva_driver_impl_env[] = "LIBVA_DRIVER_NAME";
++ // TODO(crbug/1116703) The libva intel-media driver has a known segfault in
++ // vaPutSurface, so until this is fixed, fall back to the i965 driver. There
++ // is discussion of the issue here:
++ // https://github.com/intel/media-driver/issues/818
++ if (!env->HasVar(libva_driver_impl_env))
++ env->SetVar(libva_driver_impl_env, "i965");
++
++ // Re-initialize with the new driver.
++ va_display_ = nullptr;
++ va_initialized_ = false;
++ implementation_type_ = VAImplementation::kInvalid;
++
++ if (!InitializeVaDisplay_Locked() || !InitializeVaDriver_Locked())
++ return false;
++ }
++#endif // USE_X11
++
++ return true;
++}
++
+ VAStatus VADisplayState::Deinitialize() {
+ base::AutoLock auto_lock(va_lock_);
+ VAStatus va_res = VA_STATUS_SUCCESS;
diff --git a/community/chromium/remove-dead-reloc-in-nonalloc-LD-flags.patch b/community/chromium/remove-dead-reloc-in-nonalloc-LD-flags.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4ad4f6e23bbb3a587bc4dc543f00fda2e93e7698
--- /dev/null
+++ b/community/chromium/remove-dead-reloc-in-nonalloc-LD-flags.patch
@@ -0,0 +1,37 @@
+From 74b0cb5b86f7d7f8f7c1172d85b09096bef147b7 Mon Sep 17 00:00:00 2001
+From: Daniel Nicoara <dnicoara@chromium.org>
+Date: Thu, 24 Sep 2020 02:34:24 +0000
+Subject: [PATCH] Remove dead-reloc-in-nonalloc LD flags
+
+Breakpad change landed. Revert workaround.
+
+Bug: 1105559
+Test: components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/andrd --binary=out/andrd/lib.unstripped/libcontent_shell_content_view.so --symbols-dir=/tmp/foo --platform=android
+Change-Id: I519534002898a97b15a57b9b87ac78ef3f216dee
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427349
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#810066}
+---
+ build/config/compiler/BUILD.gn | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index aa9eca20bd2..42839cfba3f 100644
+--- build/config/compiler/BUILD.gn
++++ build/config/compiler/BUILD.gn
+@@ -396,14 +396,6 @@ config("compiler") {
+ "-Wl,--as-needed",
+ ]
+ }
+- if (use_lld && !is_chromeos_device) {
+- # TODO(thakis): Fix dump_syms to not need this and then remove it,
+- # https://crbug.com/1105559
+- ldflags += [
+- "-Wl,-z,dead-reloc-in-nonalloc=*=0",
+- "-Wl,-z,dead-reloc-in-nonalloc=.debug_ranges=1",
+- ]
+- }
+ }
+
+ # Linux-specific compiler flags setup.
diff --git a/community/chromium/resolver.patch b/community/chromium/resolver.patch
index 18974790faef1baa45dab9d7cef71b8940feaa36..e9f9f7b6a9a0038422d33f6d7557ddb4a917bac9 100644
--- a/community/chromium/resolver.patch
+++ b/community/chromium/resolver.patch
@@ -4,7 +4,7 @@
#include "net/dns/dns_reloader.h"
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(__GLIBC__)
@@ -12,13 +12,13 @@
--- ./net/dns/host_resolver_manager.cc
+++ ./net/dns/host_resolver_manager.cc
-@@ -2747,8 +2747,7 @@
+@@ -2779,8 +2779,7 @@
NetworkChangeNotifier::AddConnectionTypeObserver(this);
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && defined(__GLIBC__)
++#if defined(__GLIBC__)
EnsureDnsReloaderInit();
#endif
@@ -28,7 +28,7 @@
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::WILL_BLOCK);
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(__GLIBC__)
DnsReloaderMaybeReload();
diff --git a/community/chromium/xproto-fix-underflow-in-Fp1616ToDouble.patch b/community/chromium/xproto-fix-underflow-in-Fp1616ToDouble.patch
new file mode 100644
index 0000000000000000000000000000000000000000..00300a4a91900cc0a84881b3cc28a8044423b437
--- /dev/null
+++ b/community/chromium/xproto-fix-underflow-in-Fp1616ToDouble.patch
@@ -0,0 +1,37 @@
+From 5ade494a9966c7a9675af86dc42aca62fb4d806d Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Wed, 21 Oct 2020 22:02:35 +0000
+Subject: [PATCH] [XProto] Fix underflow in Fp1616ToDouble
+
+x11::Input::Fp1616 should be treated as a signed integer, otherwise
+-1 will underflow to 65535. When dragging a scrollbar, this would
+cause the scrollbar to snap to the bottom when the cursor is dragged
+above the window's y=0 coordinate. Verified that the issue is fixed
+after this CL.
+
+BUG=1139623,1136352
+R=sky
+
+Change-Id: Ie318006ceadde9b9ce3e267fb453ddeba0e81da0
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485620
+Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
+Commit-Queue: Scott Violet <sky@chromium.org>
+Reviewed-by: Scott Violet <sky@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#819538}
+---
+ ui/events/x/events_x_utils.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/events/x/events_x_utils.cc b/ui/events/x/events_x_utils.cc
+index 3010db5f40c..856dfb221e7 100644
+--- ui/events/x/events_x_utils.cc
++++ ui/events/x/events_x_utils.cc
+@@ -376,7 +376,7 @@ base::TimeTicks TimeTicksFromXEvent(const x11::Event& xev) {
+
+ // This is ported from libxi's FP1616toDBL in XExtInt.c
+ double Fp1616ToDouble(x11::Input::Fp1616 x) {
+- auto x32 = static_cast<uint32_t>(x);
++ auto x32 = static_cast<int32_t>(x);
+ return x32 * 1.0 / (1 << 16);
+ }
+