From a85ac83b01102cd09bfe17780f6ed350ce4bcdd6 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 14 Apr 2021 21:12:33 -0500 Subject: [PATCH] Update Chromium to 90.0.4430.72 --- org.chromium.Chromium.yaml | 4 +- ...lty-free-libfdk-aac-for-AAC-playback.patch | 6 +- ...ansient-decode-errors-arising-from-l.patch | 2 +- patches/0003-Use-system-wide-node.patch | 2 +- ...fmpeg.so-is-in-the-rpath-of-binaries.patch | 2 +- ...-flatpak-Add-initial-sandbox-support.patch | 24 ++++---- ...pak-Expose-Widevine-into-the-sandbox.patch | 4 +- ...flatpak-Adjust-paths-for-the-sandbox.patch | 24 ++++---- ...omium-71.0.3578.98-widevine-r3.patch.patch | 4 +- .../0009-Enable-Chromecast-by-default.patch | 4 +- ..._WM_BYPASS_COMPOSITOR-for-fullscreen.patch | 10 ++-- ...mory-Enable-the-tab-discards-feature.patch | 4 +- ...le-accelerated-mjpeg-decode-on-Linux.patch | 26 ++++----- ...-about-AAC-and-H264-decoders-when-no.patch | 8 +-- ...-ability-to-create-desktop-shortcuts.patch | 18 +++--- ...erly-handle-lack-of-platform-support.patch | 4 +- ...erly-handle-lack-of-platform-support.patch | 55 +++++++------------ ...WRAPPER-as-the-executable-on-restart.patch | 4 +- ...port-for-the-XDG-file-chooser-portal.patch | 44 +++++++-------- ...rtal-support-for-opening-directories.patch | 4 +- ...e-new-dtags-on-non-component-builds.patch} | 4 +- ...e-references-to-enable-dse-memoryssa.patch | 29 ---------- ...especting-system-proxy-settings-whe.patch} | 24 ++++---- ...ld-In-LTO-links-run-just-one-link-a.patch} | 32 +++++------ ...me-SEQUENCE_CHECKER-capability-name.patch} | 20 +++---- 25 files changed, 160 insertions(+), 202 deletions(-) rename patches/{0021-Enable-new-dtags-on-non-component-builds.patch => 0020-Enable-new-dtags-on-non-component-builds.patch} (91%) delete mode 100644 patches/0020-Remove-references-to-enable-dse-memoryssa.patch rename patches/{0022-Add-support-for-respecting-system-proxy-settings-whe.patch => 0021-Add-support-for-respecting-system-proxy-settings-whe.patch} (96%) rename patches/{0023-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch => 0022-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch} (74%) rename patches/{0024-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch => 0023-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch} (90%) diff --git a/org.chromium.Chromium.yaml b/org.chromium.Chromium.yaml index d59df0ad..c961639b 100644 --- a/org.chromium.Chromium.yaml +++ b/org.chromium.Chromium.yaml @@ -174,8 +174,8 @@ modules: - ./install.sh sources: - type: archive - url: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.128.tar.xz - sha256: 1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b + url: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-90.0.4430.72.tar.xz + sha256: a5cc88ca8fffac21ec4d1646980f698dfb6f388a225dd7a2c5a3d252a4098943 x-checker-data: type: anitya project-id: 13344 diff --git a/patches/0001-ffmpeg-Use-royalty-free-libfdk-aac-for-AAC-playback.patch b/patches/0001-ffmpeg-Use-royalty-free-libfdk-aac-for-AAC-playback.patch index f38b98f9..4993b38e 100644 --- a/patches/0001-ffmpeg-Use-royalty-free-libfdk-aac-for-AAC-playback.patch +++ b/patches/0001-ffmpeg-Use-royalty-free-libfdk-aac-for-AAC-playback.patch @@ -1,4 +1,4 @@ -From f47615158243cf16dccad204e2d06e329c83e5c7 Mon Sep 17 00:00:00 2001 +From 89464ac4369150b047c403ed707736c534fe01ba Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 4 Jul 2018 17:02:26 +0100 Subject: [PATCH 1/4] ffmpeg: Use royalty-free libfdk-aac for AAC playback @@ -1609,10 +1609,10 @@ index 367a7f7f3c..bc43b980d5 100644 +#define FFMPEG_VERSION "4.3.git" #endif /* AVUTIL_FFVERSION_H */ diff --git a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -index 75333a2c9f..ae8cf3a69c 100755 +index b51f47934a..a77646e57e 100755 --- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py +++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -910,11 +910,27 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, +@@ -912,11 +912,27 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, '--ar=cygwin-wrapper lib', ]) diff --git a/patches/0002-ffmpeg-Handle-transient-decode-errors-arising-from-l.patch b/patches/0002-ffmpeg-Handle-transient-decode-errors-arising-from-l.patch index 05dd88b0..568d047e 100644 --- a/patches/0002-ffmpeg-Handle-transient-decode-errors-arising-from-l.patch +++ b/patches/0002-ffmpeg-Handle-transient-decode-errors-arising-from-l.patch @@ -1,4 +1,4 @@ -From 71ba0c7a857c919a5db006b2fcbc0f9d4473a3e6 Mon Sep 17 00:00:00 2001 +From b8554ce16b08329fac4563a8dc02305fddc80ea6 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Wed, 1 May 2019 17:49:42 +0200 Subject: [PATCH 2/4] ffmpeg: Handle transient decode errors arising from diff --git a/patches/0003-Use-system-wide-node.patch b/patches/0003-Use-system-wide-node.patch index 4c4ddb46..85b43654 100644 --- a/patches/0003-Use-system-wide-node.patch +++ b/patches/0003-Use-system-wide-node.patch @@ -1,4 +1,4 @@ -From 4ffb09f462a0d3bbec4eb239e71718ab18e7424c Mon Sep 17 00:00:00 2001 +From 8eb22b8000b0f54895ec140492dc4d570c0c33eb Mon Sep 17 00:00:00 2001 From: Andre Moreira Magalhaes Date: Thu, 16 Jul 2020 20:22:57 -0300 Subject: [PATCH 3/4] Use system wide node diff --git a/patches/0004-Ensure-libffmpeg.so-is-in-the-rpath-of-binaries.patch b/patches/0004-Ensure-libffmpeg.so-is-in-the-rpath-of-binaries.patch index 97bd0f76..e67a8982 100644 --- a/patches/0004-Ensure-libffmpeg.so-is-in-the-rpath-of-binaries.patch +++ b/patches/0004-Ensure-libffmpeg.so-is-in-the-rpath-of-binaries.patch @@ -1,4 +1,4 @@ -From 9d0f1fa1d670e89245bc24583a92b6ed2e8c20c2 Mon Sep 17 00:00:00 2001 +From 6fa73e046ad88de40bd25bb08cac417e2cf34785 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Thu, 1 Oct 2020 16:39:00 -0500 Subject: [PATCH 4/4] Ensure libffmpeg.so is in the rpath of binaries diff --git a/patches/0005-flatpak-Add-initial-sandbox-support.patch b/patches/0005-flatpak-Add-initial-sandbox-support.patch index bb2035a7..dc0b63ec 100644 --- a/patches/0005-flatpak-Add-initial-sandbox-support.patch +++ b/patches/0005-flatpak-Add-initial-sandbox-support.patch @@ -1,7 +1,7 @@ -From b81f8bc8d0c50b901d285b2c738316a1fc796865 Mon Sep 17 00:00:00 2001 +From 0e6f907c18e4fc968a71109a86c721fa7be64d15 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 17 Mar 2020 13:18:27 -0500 -Subject: [PATCH 05/24] flatpak: Add initial sandbox support +Subject: [PATCH 05/23] flatpak: Add initial sandbox support --- .gitignore | 1 + @@ -29,11 +29,11 @@ Subject: [PATCH 05/24] flatpak: Add initial sandbox support create mode 100644 sandbox/linux/services/flatpak_sandbox.h diff --git a/.gitignore b/.gitignore -index f6164b328aa4a..5e08625dfe664 100644 +index 0d222bbe0b579..ef17dc6e39b92 100644 --- a/.gitignore +++ b/.gitignore -@@ -62,6 +62,7 @@ v8.log - vs-chromium-project.txt +@@ -63,6 +63,7 @@ vs-chromium-project.txt + /.clangd /.clangd/ /.clangd-index/ +/.flatpak-builder/ @@ -41,10 +41,10 @@ index f6164b328aa4a..5e08625dfe664 100644 /.externalToolBuilders/ /.settings/ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index c0cc548d9f8e5..f987a8331f3b4 100644 +index ce16488c6d3c3..b1d4b70d815f3 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -284,6 +284,10 @@ namespace resource_coordinator { +@@ -286,6 +286,10 @@ namespace resource_coordinator { class TabManagerDelegate; } @@ -55,7 +55,7 @@ index c0cc548d9f8e5..f987a8331f3b4 100644 namespace service_manager { class ServiceProcessLauncher; } -@@ -414,6 +418,7 @@ class BASE_EXPORT ScopedAllowBlocking { +@@ -416,6 +420,7 @@ class BASE_EXPORT ScopedAllowBlocking { friend class printing::PrintJobWorker; friend class remoting::ScopedBypassIOThreadRestrictions; // crbug.com/1144161 friend class resource_coordinator::TabManagerDelegate; // crbug.com/778703 @@ -63,7 +63,7 @@ index c0cc548d9f8e5..f987a8331f3b4 100644 friend class web::WebSubThread; friend class weblayer::BrowserContextImpl; friend class weblayer::ContentBrowserClientImpl; -@@ -486,6 +491,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { +@@ -489,6 +494,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { friend class rlz_lib::FinancialPing; friend class shell_integration_linux:: LaunchXdgUtilityScopedAllowBaseSyncPrimitives; @@ -378,10 +378,10 @@ index 82923d4a85df3..cf4765841786a 100644 base::GlobalDescriptors::Descriptor( static_cast(kSandboxIPCChannel), GetSandboxFD())); diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn -index e9a94b46125e3..770ce3b6edfea 100644 +index 2f778dd0bcab2..25e9571232351 100644 --- a/sandbox/linux/BUILD.gn +++ b/sandbox/linux/BUILD.gn -@@ -329,6 +329,10 @@ if (is_linux || is_chromeos) { +@@ -333,6 +333,10 @@ if (is_linux || is_chromeos) { component("sandbox_services") { sources = [ @@ -392,7 +392,7 @@ index e9a94b46125e3..770ce3b6edfea 100644 "services/init_process_reaper.cc", "services/init_process_reaper.h", "services/proc_util.cc", -@@ -367,7 +371,10 @@ component("sandbox_services") { +@@ -371,7 +375,10 @@ component("sandbox_services") { defines = [ "SANDBOX_IMPLEMENTATION" ] diff --git a/patches/0006-flatpak-Expose-Widevine-into-the-sandbox.patch b/patches/0006-flatpak-Expose-Widevine-into-the-sandbox.patch index 0ffcb3b4..e9fc6e5d 100644 --- a/patches/0006-flatpak-Expose-Widevine-into-the-sandbox.patch +++ b/patches/0006-flatpak-Expose-Widevine-into-the-sandbox.patch @@ -1,7 +1,7 @@ -From c7421a7caf08140059c50b071257405159acb3e4 Mon Sep 17 00:00:00 2001 +From 800b4a9f516604313318a0529d49c0a1b04d322d Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 17 Nov 2020 13:00:39 -0600 -Subject: [PATCH 06/24] flatpak: Expose Widevine into the sandbox +Subject: [PATCH 06/23] flatpak: Expose Widevine into the sandbox --- .../zygote_host/zygote_host_impl_linux.cc | 54 +++++++++++++- diff --git a/patches/0007-flatpak-Adjust-paths-for-the-sandbox.patch b/patches/0007-flatpak-Adjust-paths-for-the-sandbox.patch index 3d05b7c5..2fd0ec5f 100644 --- a/patches/0007-flatpak-Adjust-paths-for-the-sandbox.patch +++ b/patches/0007-flatpak-Adjust-paths-for-the-sandbox.patch @@ -1,7 +1,7 @@ -From d8033a1ec89dfe9d8a1804a4dea82f31e0082a8a Mon Sep 17 00:00:00 2001 +From 096a69c3b33b58e884a41ceac0a0d6cbb19d08f5 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 25 Aug 2020 19:26:07 -0500 -Subject: [PATCH 07/24] flatpak: Adjust paths for the sandbox +Subject: [PATCH 07/23] flatpak: Adjust paths for the sandbox --- chrome/common/BUILD.gn | 4 +++ @@ -9,10 +9,10 @@ Subject: [PATCH 07/24] flatpak: Adjust paths for the sandbox 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 737d5ea55058d..b208c819e1001 100644 +index a99755c47d431..5a558ba7897df 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -649,6 +649,10 @@ static_library("constants") { +@@ -646,6 +646,10 @@ static_library("constants") { "//third_party/widevine/cdm:headers", ] } @@ -24,7 +24,7 @@ index 737d5ea55058d..b208c819e1001 100644 # Use a static library here because many test binaries depend on this but don't diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index fef80b760915b..7b86e93f9708d 100644 +index 34b525ff22356..dd679af8d27d8 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -4,6 +4,7 @@ @@ -46,7 +46,7 @@ index fef80b760915b..7b86e93f9708d 100644 #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck #endif -@@ -197,8 +202,8 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -189,8 +194,8 @@ bool PathProvider(int key, base::FilePath* result) { #else if (!GetUserDownloadsDirectory(&cur)) return false; @@ -57,7 +57,7 @@ index fef80b760915b..7b86e93f9708d 100644 #endif break; case chrome::DIR_CRASH_DUMPS: -@@ -371,7 +376,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -349,7 +354,7 @@ bool PathProvider(int key, base::FilePath* result) { #if defined(OS_MAC) cur = base::mac::FrameworkBundlePath(); cur = cur.Append(FILE_PATH_LITERAL("Resources")) @@ -66,7 +66,7 @@ index fef80b760915b..7b86e93f9708d 100644 break; #elif defined(OS_ANDROID) if (!base::PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur)) -@@ -445,6 +450,14 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -423,6 +428,14 @@ bool PathProvider(int key, base::FilePath* result) { break; #if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_OPENBSD) case chrome::DIR_POLICY_FILES: { @@ -81,7 +81,7 @@ index fef80b760915b..7b86e93f9708d 100644 #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); #else -@@ -468,7 +481,13 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -446,7 +459,13 @@ bool PathProvider(int key, base::FilePath* result) { #endif #if defined(OS_LINUX) || defined(OS_CHROMEOS) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { @@ -96,7 +96,7 @@ index fef80b760915b..7b86e93f9708d 100644 break; } #endif -@@ -478,8 +497,8 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -456,8 +475,8 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("Google")) @@ -107,7 +107,7 @@ index fef80b760915b..7b86e93f9708d 100644 create_dir = false; #else if (!base::PathService::Get(base::DIR_MODULE, &cur)) -@@ -505,19 +524,25 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -483,19 +502,25 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -139,7 +139,7 @@ index fef80b760915b..7b86e93f9708d 100644 #endif #endif // !defined(OS_MAC) break; -@@ -567,8 +592,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -536,8 +561,7 @@ bool PathProvider(int key, base::FilePath* result) { // TODO(bauerb): http://crbug.com/259796 base::ThreadRestrictions::ScopedAllowIO allow_io; diff --git a/patches/0008-Import-chromium-71.0.3578.98-widevine-r3.patch.patch b/patches/0008-Import-chromium-71.0.3578.98-widevine-r3.patch.patch index 7038377c..3bcfa220 100644 --- a/patches/0008-Import-chromium-71.0.3578.98-widevine-r3.patch.patch +++ b/patches/0008-Import-chromium-71.0.3578.98-widevine-r3.patch.patch @@ -1,7 +1,7 @@ -From 9f99dee0801b83308f4d96203c2df76647b4f56f Mon Sep 17 00:00:00 2001 +From 4a9d5722ad04117d8ae4b03f3988a1dbf0506eaf Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 17 Nov 2020 22:57:29 -0600 -Subject: [PATCH 08/24] Import chromium-71.0.3578.98-widevine-r3.patch +Subject: [PATCH 08/23] Import chromium-71.0.3578.98-widevine-r3.patch Taken from the Fedora 33 repositories. --- diff --git a/patches/0009-Enable-Chromecast-by-default.patch b/patches/0009-Enable-Chromecast-by-default.patch index 5dea153a..9c94f7d8 100644 --- a/patches/0009-Enable-Chromecast-by-default.patch +++ b/patches/0009-Enable-Chromecast-by-default.patch @@ -1,7 +1,7 @@ -From d43cdbc2e17a25b4b869d1ba4bbaaeaf3bd5099e Mon Sep 17 00:00:00 2001 +From 7226d2bcde8926af9774e016ae0a0f2b71ff34ef Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 26 Aug 2020 20:30:35 -0500 -Subject: [PATCH 09/24] Enable Chromecast by default +Subject: [PATCH 09/23] Enable Chromecast by default --- extensions/common/feature_switch.cc | 14 ++++---------- diff --git a/patches/0010-x11-Set-_NET_WM_BYPASS_COMPOSITOR-for-fullscreen.patch b/patches/0010-x11-Set-_NET_WM_BYPASS_COMPOSITOR-for-fullscreen.patch index 283ab8f2..cac88198 100644 --- a/patches/0010-x11-Set-_NET_WM_BYPASS_COMPOSITOR-for-fullscreen.patch +++ b/patches/0010-x11-Set-_NET_WM_BYPASS_COMPOSITOR-for-fullscreen.patch @@ -1,7 +1,7 @@ -From 605a0e6d60d796edbc369864511438717cbd249d Mon Sep 17 00:00:00 2001 +From 4e70cfff710ba8ae22701e3c9b17d766b55c4022 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Fri, 3 Jul 2015 14:59:24 -0600 -Subject: [PATCH 10/24] x11: Set _NET_WM_BYPASS_COMPOSITOR for fullscreen +Subject: [PATCH 10/23] x11: Set _NET_WM_BYPASS_COMPOSITOR for fullscreen This improves performance at full screen. --- @@ -11,7 +11,7 @@ This improves performance at full screen. 3 files changed, 9 insertions(+) diff --git a/ui/base/x/x11_window.cc b/ui/base/x/x11_window.cc -index 7fbc130d78df7..bacf2c8bcd1c2 100644 +index 585a09a2b6d89..688649c50754f 100644 --- a/ui/base/x/x11_window.cc +++ b/ui/base/x/x11_window.cc @@ -535,6 +535,12 @@ void XWindow::SetFullscreen(bool fullscreen) { @@ -28,7 +28,7 @@ index 7fbc130d78df7..bacf2c8bcd1c2 100644 if (!IsXWindowVisible() || !activatable_) return; diff --git a/ui/base/x/x11_window.h b/ui/base/x/x11_window.h -index efed967b24ddf..d1f8d3b9123f6 100644 +index 0a870d41a0425..bac3e48bfa88b 100644 --- a/ui/base/x/x11_window.h +++ b/ui/base/x/x11_window.h @@ -110,6 +110,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XWindow { @@ -40,7 +40,7 @@ index efed967b24ddf..d1f8d3b9123f6 100644 void Deactivate(); bool IsActive() const; diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc -index 0cfcb1cb66e36..b24659aeb99e9 100644 +index 967dd5f1c0999..dd596cf359fc2 100644 --- a/ui/platform_window/x11/x11_window.cc +++ b/ui/platform_window/x11/x11_window.cc @@ -300,6 +300,8 @@ void X11Window::ToggleFullscreen() { diff --git a/patches/0011-memory-Enable-the-tab-discards-feature.patch b/patches/0011-memory-Enable-the-tab-discards-feature.patch index b528bdb0..1ebe9b7c 100644 --- a/patches/0011-memory-Enable-the-tab-discards-feature.patch +++ b/patches/0011-memory-Enable-the-tab-discards-feature.patch @@ -1,7 +1,7 @@ -From 3bcbeb527a4e16d628a104c26351c0f37285b20c Mon Sep 17 00:00:00 2001 +From 6cc5e26c2835126981ccdc98113aa9ca8c7c83c3 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 28 Jan 2016 13:53:08 +0000 -Subject: [PATCH 11/24] memory: Enable the tab discards feature +Subject: [PATCH 11/23] memory: Enable the tab discards feature This allows manually discarding tabs from chrome://discards as well as automatic tab discards once a certain level of "memory pressure" diff --git a/patches/0012-Enable-accelerated-mjpeg-decode-on-Linux.patch b/patches/0012-Enable-accelerated-mjpeg-decode-on-Linux.patch index d556a61a..0e57231d 100644 --- a/patches/0012-Enable-accelerated-mjpeg-decode-on-Linux.patch +++ b/patches/0012-Enable-accelerated-mjpeg-decode-on-Linux.patch @@ -1,7 +1,7 @@ -From 4127d847c04a9eb5c4277b1c108c52fd088e9c30 Mon Sep 17 00:00:00 2001 +From d4dec672f3715a8697090703bef045ce54d58afa Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 19 Jan 2021 15:41:16 -0600 -Subject: [PATCH 12/24] Enable accelerated mjpeg decode on Linux +Subject: [PATCH 12/23] Enable accelerated mjpeg decode on Linux --- chrome/browser/about_flags.cc | 6 +++--- @@ -11,10 +11,10 @@ Subject: [PATCH 12/24] Enable accelerated mjpeg decode on Linux 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 1f7e7ced6a98a..9ba75ccc991e5 100644 +index 01dea31dd36b5..9111e2643a9c1 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3022,7 +3022,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3082,7 +3082,7 @@ const FeatureEntry kFeatureEntries[] = { "disable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, flag_descriptions::kAcceleratedVideoDecodeDescription, @@ -23,7 +23,7 @@ index 1f7e7ced6a98a..9ba75ccc991e5 100644 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, #endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && -@@ -3526,10 +3526,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3620,10 +3620,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR @@ -37,10 +37,10 @@ index 1f7e7ced6a98a..9ba75ccc991e5 100644 #endif // BUILDFLAG(IS_CHROMEOS_ASH) {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc -index 5990170b110ad..1afe76e601684 100644 +index dd2914ad06e92..c7d78a2054f60 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3693,6 +3693,16 @@ const char kVideoToolboxVp9DecodingDescription[] = +@@ -3807,6 +3807,16 @@ const char kMetalDescription[] = #endif @@ -57,7 +57,7 @@ index 5990170b110ad..1afe76e601684 100644 // Chrome OS ------------------------------------------------------------------- #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -3704,12 +3714,6 @@ const char kAccountManagementFlowsV2Description[] = +@@ -3818,12 +3828,6 @@ const char kAccountManagementFlowsV2Description[] = "Settings. " "See go/betterAM"; @@ -71,10 +71,10 @@ index 5990170b110ad..1afe76e601684 100644 "Allow disabling mouse acceleration"; const char kAllowDisableMouseAccelerationDescription[] = diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h -index 9ca53437280a4..b022cc15548ee 100644 +index 3479dc665a2f4..c1ed295859a2c 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2131,6 +2131,13 @@ extern const char kVideoToolboxVp9DecodingDescription[]; +@@ -2201,6 +2201,13 @@ extern const char kMetalDescription[]; #endif // defined(OS_MAC) @@ -88,7 +88,7 @@ index 9ca53437280a4..b022cc15548ee 100644 // Chrome OS ------------------------------------------------------------------ #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -2138,9 +2145,6 @@ extern const char kVideoToolboxVp9DecodingDescription[]; +@@ -2208,9 +2215,6 @@ extern const char kMetalDescription[]; extern const char kAccountManagementFlowsV2Name[]; extern const char kAccountManagementFlowsV2Description[]; @@ -99,10 +99,10 @@ index 9ca53437280a4..b022cc15548ee 100644 extern const char kAllowDisableMouseAccelerationDescription[]; diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc -index f8b848e7283b7..e14e4d03bb87f 100644 +index e3d58fd654f16..be8116d9b2fc9 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -861,7 +861,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() { +@@ -888,7 +888,7 @@ bool IsVideoCaptureAcceleratedJpegDecodingEnabled() { switches::kUseFakeMjpegDecodeAccelerator)) { return true; } diff --git a/patches/0013-ffmpeg-Don-t-lie-about-AAC-and-H264-decoders-when-no.patch b/patches/0013-ffmpeg-Don-t-lie-about-AAC-and-H264-decoders-when-no.patch index a72f130f..675b3862 100644 --- a/patches/0013-ffmpeg-Don-t-lie-about-AAC-and-H264-decoders-when-no.patch +++ b/patches/0013-ffmpeg-Don-t-lie-about-AAC-and-H264-decoders-when-no.patch @@ -1,7 +1,7 @@ -From 41c94ee9eef1f381cd1d3ebee6315fb2ffa14ee3 Mon Sep 17 00:00:00 2001 +From d10bd1ec1d563c9a25e77f2935c8787f46cbdffc Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Tue, 25 Oct 2016 16:57:00 +0000 -Subject: [PATCH 13/24] ffmpeg: Don't lie about AAC and H264 decoders when not +Subject: [PATCH 13/23] ffmpeg: Don't lie about AAC and H264 decoders when not available On Endless OS, we always build with USE_PROPRIETARY_CODECS defined @@ -31,10 +31,10 @@ https://phabricator.endlessm.com/T30300 2 files changed, 83 insertions(+), 7 deletions(-) diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn -index cd58ff418bac9..ab8f470564afb 100644 +index bcdea7612cb8f..f70b3cf9db34e 100644 --- a/media/base/BUILD.gn +++ b/media/base/BUILD.gn -@@ -384,6 +384,10 @@ source_set("base") { +@@ -393,6 +393,10 @@ source_set("base") { "//third_party/ffmpeg", "//third_party/ffmpeg:ffmpeg_features", ] diff --git a/patches/0014-Remove-the-ability-to-create-desktop-shortcuts.patch b/patches/0014-Remove-the-ability-to-create-desktop-shortcuts.patch index b5ab4357..cb1c5f81 100644 --- a/patches/0014-Remove-the-ability-to-create-desktop-shortcuts.patch +++ b/patches/0014-Remove-the-ability-to-create-desktop-shortcuts.patch @@ -1,7 +1,7 @@ -From 4849553e64f5f41ef63c526f6540658da10d8c22 Mon Sep 17 00:00:00 2001 +From 1810318a99f5451bc3e1ddd0482b5787252a6cca Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 11 Nov 2020 16:51:49 -0600 -Subject: [PATCH 14/24] Remove the ability to create desktop shortcuts +Subject: [PATCH 14/23] Remove the ability to create desktop shortcuts --- .../ui/views/create_application_shortcut_view.cc | 11 ++--------- @@ -9,10 +9,10 @@ Subject: [PATCH 14/24] Remove the ability to create desktop shortcuts 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc -index 7c4fb9badb459..f2a73670f5f59 100644 +index 008ec08507e84..204fb67d8b2af 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc -@@ -111,10 +111,6 @@ void CreateChromeApplicationShortcutView::InitControls() { +@@ -113,10 +113,6 @@ void CreateChromeApplicationShortcutView::InitControls() { create_shortcuts_label->SetHorizontalAlignment(gfx::ALIGN_LEFT); create_shortcuts_label->SetMultiLine(true); @@ -23,7 +23,7 @@ index 7c4fb9badb459..f2a73670f5f59 100644 std::unique_ptr menu_check_box; std::unique_ptr quick_launch_check_box; -@@ -170,7 +166,6 @@ void CreateChromeApplicationShortcutView::InitControls() { +@@ -172,7 +168,6 @@ void CreateChromeApplicationShortcutView::InitControls() { views::GridLayout::kFixedSize, provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL)); layout->StartRow(views::GridLayout::kFixedSize, kTableColumnSetId); @@ -31,7 +31,7 @@ index 7c4fb9badb459..f2a73670f5f59 100644 const int vertical_spacing = provider->GetDistanceMetric(DISTANCE_RELATED_CONTROL_VERTICAL_SMALL); -@@ -203,9 +198,8 @@ bool CreateChromeApplicationShortcutView::IsDialogButtonEnabled( +@@ -205,9 +200,8 @@ bool CreateChromeApplicationShortcutView::IsDialogButtonEnabled( if (!shortcut_info_) return false; // Dialog's not ready because app info hasn't been loaded. @@ -43,7 +43,7 @@ index 7c4fb9badb459..f2a73670f5f59 100644 (quick_launch_check_box_ && quick_launch_check_box_->GetChecked()); } -@@ -228,7 +222,6 @@ void CreateChromeApplicationShortcutView::OnDialogAccepted() { +@@ -226,7 +220,6 @@ void CreateChromeApplicationShortcutView::OnDialogAccepted() { return; web_app::ShortcutLocations creation_locations; @@ -52,10 +52,10 @@ index 7c4fb9badb459..f2a73670f5f59 100644 creation_locations.applications_menu_location = web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h -index 20c9b85f6ae87..94040445d23da 100644 +index b3eb556498efe..839201cf00953 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h -@@ -68,7 +68,6 @@ class CreateChromeApplicationShortcutView : public views::DialogDelegateView { +@@ -73,7 +73,6 @@ class CreateChromeApplicationShortcutView : public views::DialogDelegateView { base::OnceCallback close_callback_; // May be null if the platform doesn't support a particular location. diff --git a/patches/0015-webhid-Properly-handle-lack-of-platform-support.patch b/patches/0015-webhid-Properly-handle-lack-of-platform-support.patch index 4dbcb2b9..46cfaf43 100644 --- a/patches/0015-webhid-Properly-handle-lack-of-platform-support.patch +++ b/patches/0015-webhid-Properly-handle-lack-of-platform-support.patch @@ -1,7 +1,7 @@ -From 390271e96ffeb8bf54997d9bd87a247a90d88467 Mon Sep 17 00:00:00 2001 +From a785aff3ae6cabd0b8edac8841a1dad3e4cde6f8 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 11 Nov 2020 16:53:24 -0600 -Subject: [PATCH 15/24] [webhid] Properly handle lack of platform support +Subject: [PATCH 15/23] [webhid] Properly handle lack of platform support This avoids crashes when the platform does not have an HID service, which can occur on builds without udev. diff --git a/patches/0016-webusb-Properly-handle-lack-of-platform-support.patch b/patches/0016-webusb-Properly-handle-lack-of-platform-support.patch index 7a2ce6e2..8b00ad58 100644 --- a/patches/0016-webusb-Properly-handle-lack-of-platform-support.patch +++ b/patches/0016-webusb-Properly-handle-lack-of-platform-support.patch @@ -1,15 +1,15 @@ -From 0f1493d40f4fc8035838f40fdf4f364f5fb1e668 Mon Sep 17 00:00:00 2001 +From 94569105052ef28373c7929f20bf27da4fa1a3bd Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 11 Nov 2020 16:54:18 -0600 -Subject: [PATCH 16/24] [webusb] Properly handle lack of platform support +Subject: [PATCH 16/23] [webusb] Properly handle lack of platform support This avoids crashes and infinite device service startup loops when the platform does not have a USB service, which can occur on builds without udev. --- chrome/browser/usb/web_usb_detector.cc | 1 + - .../device/usb/mojo/device_manager_impl.cc | 40 ++++++++++++------- - 2 files changed, 27 insertions(+), 14 deletions(-) + .../device/usb/mojo/device_manager_impl.cc | 27 +++++++++++++------ + 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/chrome/browser/usb/web_usb_detector.cc b/chrome/browser/usb/web_usb_detector.cc index 6e28665b92112..6f6f432fbe478 100644 @@ -24,10 +24,10 @@ index 6e28665b92112..6f6f432fbe478 100644 } diff --git a/services/device/usb/mojo/device_manager_impl.cc b/services/device/usb/mojo/device_manager_impl.cc -index 10eea22b5f9ef..06ed19691a4f6 100644 +index 6415ecdb6e2ab..35ecdc35278cf 100644 --- a/services/device/usb/mojo/device_manager_impl.cc +++ b/services/device/usb/mojo/device_manager_impl.cc -@@ -46,29 +46,38 @@ DeviceManagerImpl::~DeviceManagerImpl() = default; +@@ -46,23 +46,31 @@ DeviceManagerImpl::~DeviceManagerImpl() = default; void DeviceManagerImpl::AddReceiver( mojo::PendingReceiver receiver) { @@ -39,48 +39,35 @@ index 10eea22b5f9ef..06ed19691a4f6 100644 void DeviceManagerImpl::EnumerateDevicesAndSetClient( mojo::PendingAssociatedRemote client, EnumerateDevicesAndSetClientCallback callback) { -- usb_service_->GetDevices( -- /*allow_restricted_devices=*/false, -- base::BindOnce(&DeviceManagerImpl::OnGetDevices, -- weak_factory_.GetWeakPtr(), -- /*options=*/nullptr, std::move(client), -- /*is_vm_sharing_client=*/false, std::move(callback))); +- usb_service_->GetDevices(base::BindOnce( +- &DeviceManagerImpl::OnGetDevices, weak_factory_.GetWeakPtr(), +- /*options=*/nullptr, std::move(client), std::move(callback))); + if (usb_service_) { -+ usb_service_->GetDevices( -+ /*allow_restricted_devices=*/false, -+ base::BindOnce(&DeviceManagerImpl::OnGetDevices, -+ weak_factory_.GetWeakPtr(), -+ /*options=*/nullptr, std::move(client), -+ /*is_vm_sharing_client=*/false, std::move(callback))); ++ usb_service_->GetDevices(base::BindOnce( ++ &DeviceManagerImpl::OnGetDevices, weak_factory_.GetWeakPtr(), ++ /*options=*/nullptr, std::move(client), std::move(callback))); + } else { -+ OnGetDevices(nullptr, std::move(client), /*is_vm_sharing_client=*/false, -+ std::move(callback), {}); ++ OnGetDevices(nullptr, std::move(client), std::move(callback), {}); + } } void DeviceManagerImpl::GetDevices(mojom::UsbEnumerationOptionsPtr options, GetDevicesCallback callback) { -- usb_service_->GetDevices( -- /*allow_restricted_devices=*/false, -- base::BindOnce(&DeviceManagerImpl::OnGetDevices, -- weak_factory_.GetWeakPtr(), std::move(options), -- mojo::NullAssociatedRemote(), -- /*is_vm_sharing_client=*/false, std::move(callback))); +- usb_service_->GetDevices(base::BindOnce( +- &DeviceManagerImpl::OnGetDevices, weak_factory_.GetWeakPtr(), +- std::move(options), mojo::NullAssociatedRemote(), std::move(callback))); + if (usb_service_) { -+ usb_service_->GetDevices( -+ /*allow_restricted_devices=*/false, -+ base::BindOnce(&DeviceManagerImpl::OnGetDevices, -+ weak_factory_.GetWeakPtr(), std::move(options), -+ mojo::NullAssociatedRemote(), -+ /*is_vm_sharing_client=*/false, std::move(callback))); ++ usb_service_->GetDevices(base::BindOnce( ++ &DeviceManagerImpl::OnGetDevices, weak_factory_.GetWeakPtr(), ++ std::move(options), mojo::NullAssociatedRemote(), std::move(callback))); + } else { + OnGetDevices(std::move(options), mojo::NullAssociatedRemote(), -+ /*is_vm_sharing_client=*/false, std::move(callback), {}); ++ std::move(callback), {}); + } } void DeviceManagerImpl::GetDevice( -@@ -274,6 +283,9 @@ void DeviceManagerImpl::GetDeviceInternal( +@@ -223,6 +231,9 @@ void DeviceManagerImpl::GetDeviceInternal( mojo::PendingReceiver device_receiver, mojo::PendingRemote device_client, bool allow_security_key_requests) { diff --git a/patches/0017-Use-CHROME_WRAPPER-as-the-executable-on-restart.patch b/patches/0017-Use-CHROME_WRAPPER-as-the-executable-on-restart.patch index c238adaf..a54e7c66 100644 --- a/patches/0017-Use-CHROME_WRAPPER-as-the-executable-on-restart.patch +++ b/patches/0017-Use-CHROME_WRAPPER-as-the-executable-on-restart.patch @@ -1,7 +1,7 @@ -From f3e2a5b38b0bb6ddeaae2885f824e53c0d61f110 Mon Sep 17 00:00:00 2001 +From fd5e965eb88c165455f7fbb0a355d034f294e6fc Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 11 Nov 2020 17:13:38 -0600 -Subject: [PATCH 17/24] Use CHROME_WRAPPER as the executable on restart +Subject: [PATCH 17/23] Use CHROME_WRAPPER as the executable on restart --- chrome/browser/first_run/upgrade_util_linux.cc | 7 ++++++- diff --git a/patches/0018-Add-support-for-the-XDG-file-chooser-portal.patch b/patches/0018-Add-support-for-the-XDG-file-chooser-portal.patch index fc783e04..237de03f 100644 --- a/patches/0018-Add-support-for-the-XDG-file-chooser-portal.patch +++ b/patches/0018-Add-support-for-the-XDG-file-chooser-portal.patch @@ -1,7 +1,7 @@ -From f4befa54beca1e3b81ebb7e68c7c8d8eb46bd4c5 Mon Sep 17 00:00:00 2001 +From 1032fa34c9cc2a89962616b04f014e322b3cdcdc Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Mon, 31 Aug 2020 15:26:52 -0500 -Subject: [PATCH 18/24] Add support for the XDG file chooser portal +Subject: [PATCH 18/23] Add support for the XDG file chooser portal --- chrome/browser/about_flags.cc | 7 + @@ -20,10 +20,10 @@ Subject: [PATCH 18/24] Add support for the XDG file chooser portal create mode 100644 ui/gtk/select_file_dialog_impl_portal.h diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 9ba75ccc991e5..a5e3735579264 100644 +index 9111e2643a9c1..10eaec0cea60f 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5094,6 +5094,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5206,6 +5206,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kVaapiWebPImageDecodeAcceleration)}, #endif @@ -38,10 +38,10 @@ index 9ba75ccc991e5..a5e3735579264 100644 {"calculate-native-win-occlusion", flag_descriptions::kCalculateNativeWinOcclusionName, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc -index 1afe76e601684..93d8fcb0f856d 100644 +index c7d78a2054f60..6b78996a6490c 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3537,6 +3537,17 @@ const char kTabFreezeDescription[] = +@@ -3661,6 +3661,17 @@ const char kTabFreezeDescription[] = #endif // !defined(OS_ANDROID) @@ -60,10 +60,10 @@ index 1afe76e601684..93d8fcb0f856d 100644 #if defined(OS_WIN) diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h -index b022cc15548ee..20372fec06d52 100644 +index c1ed295859a2c..987c6ae92dc69 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2031,6 +2031,15 @@ extern const char kTabFreezeDescription[]; +@@ -2107,6 +2107,15 @@ extern const char kTabFreezeDescription[]; #endif // defined(OS_ANDROID) @@ -80,10 +80,10 @@ index b022cc15548ee..20372fec06d52 100644 #if defined(OS_WIN) diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc -index d0c34f9bcb668..b58751840bf2a 100644 +index 1097f90e485ce..cb6a06386a67c 100644 --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -206,7 +206,7 @@ const base::Feature kEnableNewCanvas2DAPI{"EnableNewCanvas2DAPI", +@@ -230,7 +230,7 @@ const base::Feature kEnableNewCanvas2DAPI{"EnableNewCanvas2DAPI", // media-device enumeration will provide at most one device per type and the // device IDs will not be available. // TODO(crbug.com/1019176): remove the feature in M89. @@ -92,7 +92,7 @@ index d0c34f9bcb668..b58751840bf2a 100644 "EnumerateDevicesHideDeviceIDs", #if defined(OS_ANDROID) base::FEATURE_DISABLED_BY_DEFAULT -@@ -895,7 +895,13 @@ const base::Feature kWarmUpNetworkProcess{"WarmUpNetworkProcess", +@@ -953,7 +953,13 @@ const base::Feature kWarmUpNetworkProcess{"WarmUpNetworkProcess", const base::Feature kWebNfc{"WebNFC", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_ANDROID) @@ -108,10 +108,10 @@ index d0c34f9bcb668..b58751840bf2a 100644 const base::Feature kDeviceMonitorMac{"DeviceMonitorMac", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h -index 7d2268668a0a4..64f20c9731879 100644 +index a1a9a4d3dc8cf..f489d0e416271 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h -@@ -206,6 +206,10 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; +@@ -219,6 +219,10 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; CONTENT_EXPORT extern const base::Feature kWebNfc; #endif // defined(OS_ANDROID) @@ -120,13 +120,13 @@ index 7d2268668a0a4..64f20c9731879 100644 +#endif + #if defined(OS_MAC) + CONTENT_EXPORT extern const base::Feature kDesktopCaptureMacV2; CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac; - CONTENT_EXPORT extern const base::Feature kIOSurfaceCapturer; diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn -index bf6b7eef0bd56..c7844fc5bc34b 100644 +index 447f77309fb41..a9dda03c1a547 100644 --- a/ui/gtk/BUILD.gn +++ b/ui/gtk/BUILD.gn -@@ -45,6 +45,8 @@ component("gtk") { +@@ -61,6 +61,8 @@ component("gtk") { "select_file_dialog_impl_gtk.cc", "select_file_dialog_impl_gtk.h", "select_file_dialog_impl_kde.cc", @@ -135,7 +135,7 @@ index bf6b7eef0bd56..c7844fc5bc34b 100644 "settings_provider.h", "settings_provider_gtk.cc", "settings_provider_gtk.h", -@@ -73,6 +75,9 @@ component("gtk") { +@@ -90,6 +92,9 @@ component("gtk") { # our own HarfBuzz avoid mixing symbols from system HarfBuzz and # our own through the indirect dependency to harfbuzz-ng here. "//build/config/linux/gtk", @@ -145,7 +145,7 @@ index bf6b7eef0bd56..c7844fc5bc34b 100644 "//third_party:freetype_harfbuzz", "//ui/aura", "//ui/base", -@@ -91,6 +96,7 @@ component("gtk") { +@@ -108,6 +113,7 @@ component("gtk") { "//ui/shell_dialogs", "//ui/strings", "//ui/views", @@ -154,10 +154,10 @@ index bf6b7eef0bd56..c7844fc5bc34b 100644 if (use_cups) { diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc -index 9bd557d333954..d2f42c7aa647e 100644 +index 2c96ffb0b5b8c..fc10765c0badc 100644 --- a/ui/gtk/gtk_ui.cc +++ b/ui/gtk/gtk_ui.cc -@@ -392,6 +392,8 @@ GtkUi::GtkUi(ui::GtkUiDelegate* delegate) : delegate_(delegate) { +@@ -338,6 +338,8 @@ GtkUi::GtkUi(ui::GtkUiDelegate* delegate) : delegate_(delegate) { GtkUi::~GtkUi() { gtk_widget_destroy(fake_window_); g_gtk_ui = nullptr; @@ -166,7 +166,7 @@ index 9bd557d333954..d2f42c7aa647e 100644 } ui::GtkUiDelegate* GtkUi::GetDelegate() { -@@ -445,6 +447,8 @@ void GtkUi::Initialize() { +@@ -394,6 +396,8 @@ void GtkUi::Initialize() { &GetPdfPaperSizeDeviceUnitsGtk); #endif @@ -176,7 +176,7 @@ index 9bd557d333954..d2f42c7aa647e 100644 settings_provider_ = CreateSettingsProvider(this); diff --git a/ui/gtk/select_file_dialog_impl.cc b/ui/gtk/select_file_dialog_impl.cc -index 8dfc91f918e42..41889aa2426c5 100644 +index 36d53b986b8d3..28a42b9cc8887 100644 --- a/ui/gtk/select_file_dialog_impl.cc +++ b/ui/gtk/select_file_dialog_impl.cc @@ -7,21 +7,26 @@ diff --git a/patches/0019-Add-OpenURI-portal-support-for-opening-directories.patch b/patches/0019-Add-OpenURI-portal-support-for-opening-directories.patch index cd565fbd..ae59d9d1 100644 --- a/patches/0019-Add-OpenURI-portal-support-for-opening-directories.patch +++ b/patches/0019-Add-OpenURI-portal-support-for-opening-directories.patch @@ -1,7 +1,7 @@ -From 4956f6abe254cda958c049817b52f6577bdc5133 Mon Sep 17 00:00:00 2001 +From 7cdc85a69224831970cfb5e146a69d8fbc6f9a16 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Tue, 17 Nov 2020 22:35:26 -0600 -Subject: [PATCH 19/24] Add OpenURI portal support for opening directories +Subject: [PATCH 19/23] Add OpenURI portal support for opening directories --- chrome/browser/platform_util_linux.cc | 80 +++++++++++++++++++++++---- diff --git a/patches/0021-Enable-new-dtags-on-non-component-builds.patch b/patches/0020-Enable-new-dtags-on-non-component-builds.patch similarity index 91% rename from patches/0021-Enable-new-dtags-on-non-component-builds.patch rename to patches/0020-Enable-new-dtags-on-non-component-builds.patch index f1bb4aa7..fe303ab3 100644 --- a/patches/0021-Enable-new-dtags-on-non-component-builds.patch +++ b/patches/0020-Enable-new-dtags-on-non-component-builds.patch @@ -1,7 +1,7 @@ -From 1e1b470774a8653d4526d9fe70375378fb29d9a5 Mon Sep 17 00:00:00 2001 +From 840193ab90e286ff6e8ce7398772ab7fd1776b80 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Thu, 19 Nov 2020 16:20:05 -0600 -Subject: [PATCH 21/24] Enable new-dtags on non-component builds +Subject: [PATCH 20/23] Enable new-dtags on non-component builds --- build/config/gcc/BUILD.gn | 23 ++++++++++++++++------- diff --git a/patches/0020-Remove-references-to-enable-dse-memoryssa.patch b/patches/0020-Remove-references-to-enable-dse-memoryssa.patch deleted file mode 100644 index 09f61a81..00000000 --- a/patches/0020-Remove-references-to-enable-dse-memoryssa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 39b03c2a4fc36fb33e15b01bff760fdc16739ab6 Mon Sep 17 00:00:00 2001 -From: Ryan Gonzalez -Date: Tue, 17 Nov 2020 23:33:35 -0600 -Subject: [PATCH 20/24] Remove references to enable-dse-memoryssa - -This was a feature added in (or at least enabled by default in) LLVM 12, -which is far newer than the freedesktop SDK's LLVM 10. Therefore, it -essentially fixes nothing and solely breaks the build. ---- - build/config/compiler/BUILD.gn | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 5928c561b5a36..7339eb53fd799 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -651,9 +651,6 @@ config("compiler") { - "-Wl,--thinlto-cache-policy,$cache_policy", - ] - -- # TODO(https://crbug.com/1127713): Investigate, remove. -- ldflags += [ "-Wl,-mllvm,-enable-dse-memoryssa=false" ] -- - ldflags += [ "-Wl,--lto-O" + lto_opt_level ] - if (thin_lto_enable_optimizations) { - # TODO(gbiv): We ideally shouldn't need to specify this; ThinLTO --- -2.29.2 - diff --git a/patches/0022-Add-support-for-respecting-system-proxy-settings-whe.patch b/patches/0021-Add-support-for-respecting-system-proxy-settings-whe.patch similarity index 96% rename from patches/0022-Add-support-for-respecting-system-proxy-settings-whe.patch rename to patches/0021-Add-support-for-respecting-system-proxy-settings-whe.patch index 958c0306..a6d18601 100644 --- a/patches/0022-Add-support-for-respecting-system-proxy-settings-whe.patch +++ b/patches/0021-Add-support-for-respecting-system-proxy-settings-whe.patch @@ -1,7 +1,7 @@ -From cfc6c5777cbb135bf49e55adba029edfa18c95dc Mon Sep 17 00:00:00 2001 +From 8971cdf683c02b3ea7d242fcbc3442b8b49a6fe0 Mon Sep 17 00:00:00 2001 From: Andre Moreira Magalhaes Date: Thu, 17 Dec 2020 19:05:10 -0300 -Subject: [PATCH 22/24] Add support for respecting system proxy settings when +Subject: [PATCH 21/23] Add support for respecting system proxy settings when running on Linux/Flatpak Some general notes on implementation: @@ -54,10 +54,10 @@ Closes https://github.com/flathub/org.chromium.Chromium/issues/36 create mode 100644 net/proxy_resolution/proxy_resolver_linux.h diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd -index 3173fac28aa8b..8aa658f2e694f 100644 +index 43f5940e58ba9..927b9becfb721 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd -@@ -9433,6 +9433,12 @@ Please help our engineers fix this problem. Tell us what happened right before y +@@ -9470,6 +9470,12 @@ Please help our engineers fix this problem. Tell us what happened right before y <p>But you can still configure via the command line. Please see <code>man $2google-chrome</code> for more information on flags and environment variables.</p> @@ -71,10 +71,10 @@ index 3173fac28aa8b..8aa658f2e694f 100644 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 1075f22db31a3..4b051e42d4f14 100644 +index c15186c8bd789..260f64b990eee 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -84,6 +84,7 @@ +@@ -83,6 +83,7 @@ #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" @@ -82,7 +82,7 @@ index 1075f22db31a3..4b051e42d4f14 100644 #include "ui/base/l10n/l10n_util.h" #endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -614,7 +615,13 @@ void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( +@@ -610,7 +611,13 @@ void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams( // or if it does work, now. // Should be possible now that a private isolate is used. // http://crbug.com/474654 @@ -98,7 +98,7 @@ index 1075f22db31a3..4b051e42d4f14 100644 LOG(ERROR) << "Cannot use V8 Proxy resolver in single process mode."; } else { diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc -index 6c2f12505e016..1c82467b70ca2 100644 +index 3d0d6375ec142..53edee98278e4 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -94,6 +94,10 @@ @@ -131,10 +131,10 @@ index 6c2f12505e016..1c82467b70ca2 100644 base::ASCIIToUTF16(binary.BaseName().value()))); AppendFooter(&data); diff --git a/net/BUILD.gn b/net/BUILD.gn -index d214ac4959ff7..8fc5b5c3adca5 100644 +index 216ed593daed1..2e90726f354f7 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1239,6 +1239,8 @@ component("net") { +@@ -1228,6 +1228,8 @@ component("net") { "base/network_change_notifier_linux.h", "proxy_resolution/proxy_config_service_linux.cc", "proxy_resolution/proxy_config_service_linux.h", @@ -143,7 +143,7 @@ index d214ac4959ff7..8fc5b5c3adca5 100644 ] } -@@ -1704,6 +1706,7 @@ source_set("net_deps") { +@@ -1693,6 +1695,7 @@ source_set("net_deps") { if (use_gio) { public_configs += [ "//build/linux:gio_config" ] @@ -152,7 +152,7 @@ index d214ac4959ff7..8fc5b5c3adca5 100644 if (is_android) { diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc -index ccfd4e8f936e8..c18a8778d6919 100644 +index e7b58d26518b7..d9a10aeefa92d 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc @@ -52,6 +52,7 @@ diff --git a/patches/0023-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch b/patches/0022-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch similarity index 74% rename from patches/0023-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch rename to patches/0022-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch index 4ebb74f0..e2462fd6 100644 --- a/patches/0023-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch +++ b/patches/0022-Revert-Reland-build-In-LTO-links-run-just-one-link-a.patch @@ -1,7 +1,7 @@ -From 874a96f2f73df248e736c8fc0b977f8c984ba164 Mon Sep 17 00:00:00 2001 +From b944fa9ca3fe8274de94bc81ec6dd30dc4e8a740 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 20 Jan 2021 10:33:46 -0600 -Subject: [PATCH 23/24] Revert "Reland "build: In LTO links, run just one link +Subject: [PATCH 22/23] Revert "Reland "build: In LTO links, run just one link at once, but give it all cores"" This reverts commit a2ebd1511b2ee20072f0768ffb7620066dc643e9. @@ -14,19 +14,19 @@ The flags given do not work on LLVM 10. 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 7339eb53fd799..833ff18b7e369 100644 +index 2166af00a6ccc..c7a7f75b74fe9 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -622,7 +622,7 @@ config("compiler") { - # files on Windows (https://crbug.com/871962). +@@ -635,7 +635,7 @@ config("compiler") { + + if (is_win) { ldflags += [ - "/opt:lldlto=" + lto_opt_level, - "/opt:lldltojobs=all", + "/opt:lldltojobs=" + max_jobs_per_link, - - # Experimentally determined to yield a reasonable trade-off between - # build time, run-time performance, and binary size. -@@ -635,11 +635,10 @@ config("compiler") { + "-mllvm:-import-instr-limit=$import_instr_limit", + "/lldltocache:" + + rebase_path("$root_out_dir/thinlto-cache", root_build_dir), +@@ -648,11 +648,10 @@ config("compiler") { # usage in crbug.com/1038040. Note this will increase build time in # Chrome OS. @@ -40,13 +40,13 @@ index 7339eb53fd799..833ff18b7e369 100644 + # resource allocation scheme, but should be good enough. + ldflags += [ "-Wl,--thinlto-jobs=" + max_jobs_per_link ] - # Limit the size of the ThinLTO cache to the lesser of 10% of - # available disk space, 10GB and 100000 files. + ldflags += [ + "-Wl,--thinlto-cache-dir=" + diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni -index 58afef011e035..1348c2c50c9f7 100644 +index afcf1dbe26831..2d9ebea0450e2 100644 --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni -@@ -75,6 +75,10 @@ declare_args() { +@@ -76,6 +76,10 @@ declare_args() { # If true, use Goma for ThinLTO code generation where applicable. use_goma_thin_lto = false @@ -58,10 +58,10 @@ index 58afef011e035..1348c2c50c9f7 100644 # than the one we're compiling for. # diff --git a/build/toolchain/concurrent_links.gni b/build/toolchain/concurrent_links.gni -index 6000b37e53c51..b980000c20afb 100644 +index 1328f7d48a6a4..bef0b24898cff 100644 --- a/build/toolchain/concurrent_links.gni +++ b/build/toolchain/concurrent_links.gni -@@ -94,7 +94,6 @@ if (concurrent_links == -1) { +@@ -100,7 +100,6 @@ if (concurrent_links == -1) { java_cmd_pool_size = _command_dict.secondary_pool_size } } else { diff --git a/patches/0024-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch b/patches/0023-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch similarity index 90% rename from patches/0024-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch rename to patches/0023-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch index 2d35d5f1..488389d1 100644 --- a/patches/0024-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch +++ b/patches/0023-Revert-base-Rename-SEQUENCE_CHECKER-capability-name.patch @@ -1,7 +1,7 @@ -From 998091a8fe493fe9d257976d3cd35e4303967f55 Mon Sep 17 00:00:00 2001 +From 6a708f33783cfa418c5a11278c8d40e59e290d68 Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez Date: Wed, 3 Mar 2021 12:18:20 -0600 -Subject: [PATCH 24/24] Revert "[base]: Rename SEQUENCE_CHECKER capability +Subject: [PATCH 23/23] Revert "[base]: Rename SEQUENCE_CHECKER capability name." This reverts commit f19e574f37f573256b631d6ee86189c0bcb512b3. @@ -13,10 +13,10 @@ This reverts commit f19e574f37f573256b631d6ee86189c0bcb512b3. 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/base/sequence_checker.h b/base/sequence_checker.h -index 7a2d0f5c5c6e0..a3e994541ac72 100644 +index 50a548a759c2d..574962af1dd72 100644 --- a/base/sequence_checker.h +++ b/base/sequence_checker.h -@@ -88,10 +88,9 @@ namespace base { +@@ -98,10 +98,9 @@ namespace base { // // Note: You should almost always use the SequenceChecker class (through the // above macros) to get the right version for your build configuration. @@ -28,9 +28,9 @@ index 7a2d0f5c5c6e0..a3e994541ac72 100644 +// order to support thread_annotations.h. +class LOCKABLE SequenceCheckerDoNothing { public: - SequenceCheckerDoNothing() = default; + static void EnableStackLogging() {} -@@ -108,9 +107,11 @@ class THREAD_ANNOTATION_ATTRIBUTE__(capability("context")) +@@ -122,9 +121,11 @@ class THREAD_ANNOTATION_ATTRIBUTE__(capability("context")) }; #if DCHECK_IS_ON() @@ -43,12 +43,12 @@ index 7a2d0f5c5c6e0..a3e994541ac72 100644 +}; #endif // DCHECK_IS_ON() - class SCOPED_LOCKABLE ScopedValidateSequenceChecker { + #if DCHECK_IS_ON() diff --git a/base/sequence_checker_impl.h b/base/sequence_checker_impl.h -index 716f067effdbf..f472111ae2308 100644 +index e22d358c21fa3..9339b660b2be5 100644 --- a/base/sequence_checker_impl.h +++ b/base/sequence_checker_impl.h -@@ -19,10 +19,9 @@ namespace base { +@@ -22,10 +22,9 @@ class StackTrace; // // Note: You should almost always use the SequenceChecker class to get the right // version for your build configuration. @@ -60,7 +60,7 @@ index 716f067effdbf..f472111ae2308 100644 +// order to support thread_annotations.h. +class LOCKABLE BASE_EXPORT SequenceCheckerImpl { public: - SequenceCheckerImpl(); + static void EnableStackLogging(); diff --git a/base/sequence_checker_unittest.nc b/base/sequence_checker_unittest.nc index a282ffeba85d5..61b6bf00110b4 100644