From b6e819b32943724c1a62a74df919cc54d99ea4df Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 3 May 2024 13:52:49 +0000 Subject: [PATCH] Update to Chromium version 124.0.6367.119 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser.patch | 2 +- patch/patches/chrome_runtime.patch | 34 +++++++++++----------- patch/patches/rfh_navigation_4829483.patch | 2 +- patch/patches/views_widget.patch | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 6752f18d7..94735abec 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/124.0.6367.60', + 'chromium_checkout': 'refs/tags/124.0.6367.119', 'depot_tools_checkout': '4246ba023a' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index da01b241a..6775b9bf7 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index e382658efba86..1d1d57f1eb413 100644 +index 0386b3db3ce09..9fcfab5d30f39 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 4c4923efc..bf607a7b6 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -1,5 +1,5 @@ diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc -index 73b6ab0934b14..26f9334cdb668 100644 +index 81254cc2dd554..a6b3412097151 100644 --- chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc @@ -41,6 +41,7 @@ @@ -10,7 +10,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 #include "chrome/browser/buildflags.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/chrome_resource_bundle_helper.h" -@@ -613,6 +614,9 @@ struct MainFunction { +@@ -616,6 +617,9 @@ struct MainFunction { // Initializes the user data dir. Must be called before InitializeLocalState(). void InitializeUserDataDir(base::CommandLine* command_line) { @@ -20,7 +20,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 #if BUILDFLAG(IS_CHROMEOS_LACROS) // In debug builds of Lacros, we keep track of when the user data dir // is initialized, to ensure the cryptohome is not accessed before login -@@ -853,6 +857,10 @@ ChromeMainDelegate::~ChromeMainDelegate() { +@@ -847,6 +851,10 @@ ChromeMainDelegate::~ChromeMainDelegate() { ChromeMainDelegate::~ChromeMainDelegate() = default; #endif // !BUILDFLAG(IS_ANDROID) @@ -31,7 +31,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 std::optional ChromeMainDelegate::PostEarlyInitialization( InvokedIn invoked_in) { DUMP_WILL_BE_CHECK(base::ThreadPoolInstance::Get()); -@@ -878,7 +886,7 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( +@@ -872,7 +880,7 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( // future session's metrics. DeferBrowserMetrics(user_data_dir); @@ -40,7 +40,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 // In the case the process is not the singleton process, the uninstall tasks // need to be executed here. A window will be displayed asking to close all // running instances. -@@ -1049,7 +1057,8 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( +@@ -1056,7 +1064,8 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( if (base::FeatureList::IsEnabled( features::kWriteBasicSystemProfileToPersistentHistogramsFile)) { @@ -50,7 +50,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 #if BUILDFLAG(IS_ANDROID) record = base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions); -@@ -1520,6 +1529,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1527,6 +1536,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -58,7 +58,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 crash_reporter::InitializeCrashKeys(); #if BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -1538,6 +1548,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1545,6 +1555,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitMacCrashReporter(command_line, process_type); SetUpInstallerPreferences(command_line); #endif @@ -66,7 +66,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 #if BUILDFLAG(IS_WIN) child_process_logging::Init(); -@@ -1750,6 +1761,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1757,6 +1768,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -74,7 +74,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { -@@ -1785,6 +1797,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1792,6 +1804,7 @@ void ChromeMainDelegate::PreSandboxStartup() { // After all the platform Breakpads have been initialized, store the command // line for crash reporting. crash_keys::SetCrashKeysFromCommandLine(command_line); @@ -82,7 +82,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 #if BUILDFLAG(ENABLE_PDF) MaybePatchGdiGetFontData(); -@@ -1910,6 +1923,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1917,6 +1930,7 @@ void ChromeMainDelegate::ZygoteForked() { SetUpProfilingShutdownHandler(); } @@ -90,7 +90,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets // this up for the browser process in a different manner. const base::CommandLine* command_line = -@@ -1922,6 +1936,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1929,6 +1943,7 @@ void ChromeMainDelegate::ZygoteForked() { // Reset the command line for the newly spawned process. crash_keys::SetCrashKeysFromCommandLine(*command_line); @@ -98,7 +98,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -2021,6 +2036,7 @@ void ChromeMainDelegate::InitializeMemorySystem() { +@@ -2028,6 +2043,7 @@ void ChromeMainDelegate::InitializeMemorySystem() { channel == version_info::Channel::DEV); const bool gwp_asan_boost_sampling = is_canary_dev || is_browser_process; @@ -106,7 +106,7 @@ index 73b6ab0934b14..26f9334cdb668 100644 memory_system::Initializer() .SetGwpAsanParameters(gwp_asan_boost_sampling, process_type) .SetProfilingClientParameters(channel, -@@ -2030,5 +2046,5 @@ void ChromeMainDelegate::InitializeMemorySystem() { +@@ -2037,5 +2053,5 @@ void ChromeMainDelegate::InitializeMemorySystem() { memory_system::DispatcherParameters:: AllocationTraceRecorderInclusion::kDynamic, process_type) @@ -536,7 +536,7 @@ index 943300d211a0b..714227335ba8b 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index 9686c676b0f0b..527e696bfe16d 100644 +index 0328a8c6e8c19..da3872499ae52 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -16,6 +16,7 @@ @@ -558,7 +558,7 @@ index 9686c676b0f0b..527e696bfe16d 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" -@@ -1689,7 +1694,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1696,7 +1701,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -568,7 +568,7 @@ index 9686c676b0f0b..527e696bfe16d 100644 downgrade::RegisterPrefs(registry); #endif -@@ -1721,6 +1727,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1728,6 +1734,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); @@ -580,7 +580,7 @@ index 9686c676b0f0b..527e696bfe16d 100644 } // Register prefs applicable to all profiles. -@@ -2155,6 +2166,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2162,6 +2173,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, const std::string& locale) { RegisterProfilePrefs(registry, locale); diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index ec079717b..bb141f98b 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 2e40dedd1e7ed..8a7ff210d5849 100644 +index 2c985367d1c62..2fdb057ac6e89 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc @@ -10539,6 +10539,7 @@ void RenderFrameHostImpl::CommitNavigation( diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 79e2fd2d0..edf064a03 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -61,7 +61,7 @@ index e9ad2d5751f2d..e51381e8f2dbf 100644 case ui::SHOW_STATE_MAXIMIZED: return kSerializedShowStateMaximized; diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc -index 6b6902c0cb0ee..d724e1dfe7d49 100644 +index f67fa6e039aed..6e54bee79a667 100644 --- content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc @@ -660,6 +660,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {