From 3f4d8297f259c7201bc6cc0e2a38c39a5510e876 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 9 Oct 2024 16:36:31 +0000 Subject: [PATCH] Update to Chromium version 130.0.6723.31 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser.patch | 2 +- .../chrome_browser_context_menus.patch | 8 ++-- patch/patches/chrome_runtime.patch | 48 +++++++++---------- patch/patches/chrome_runtime_views.patch | 14 +++--- patch/patches/gn_config.patch | 2 +- patch/patches/rfh_navigation_4829483.patch | 4 +- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 9ce183360..11a6ea5b1 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/130.0.6723.19' + 'chromium_checkout': 'refs/tags/130.0.6723.31' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index cd39f3d65..a541e15f9 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 dd5c9db43d693..9a158633310fc 100644 +index 2b66b11333f73..1ea2ceb0ae0dc 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/compiler/pgo/pgo.gni") diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index a0aba9c4a..1851de504 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index c5511b1df85cf..f56a4efcfb8d2 100644 +index aa0d1cc1d45fe..9329872580f9b 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -360,6 +360,18 @@ base::OnceCallback* GetMenuShownCallback() { @@ -32,7 +32,7 @@ index c5511b1df85cf..f56a4efcfb8d2 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -902,6 +918,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -907,6 +923,14 @@ RenderViewContextMenu::RenderViewContextMenu( : nullptr; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -47,7 +47,7 @@ index c5511b1df85cf..f56a4efcfb8d2 100644 observers_.AddObserver(&autofill_context_menu_manager_); } -@@ -1358,6 +1382,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1363,6 +1387,12 @@ void RenderViewContextMenu::InitMenu() { autofill_client->HideAutofillSuggestions( autofill::SuggestionHidingReason::kContextMenuOpened); } @@ -60,7 +60,7 @@ index c5511b1df85cf..f56a4efcfb8d2 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3643,6 +3673,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3645,6 +3675,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 0cc15dc9c..eb7d3526d 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -248,7 +248,7 @@ index ac1361bd6bc2e..a303ca169c7f7 100644 base::PathService::OverrideAndCreateIfNeeded( diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc -index b85539a24653f..48c74152428cf 100644 +index dbce369a3e8bd..a7fbe297c56d1 100644 --- chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc @@ -53,6 +53,7 @@ @@ -259,7 +259,7 @@ index b85539a24653f..48c74152428cf 100644 #include "chrome/browser/about_flags.h" #include "chrome/browser/active_use_util.h" #include "chrome/browser/after_startup_task_utils.h" -@@ -530,7 +531,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -531,7 +532,7 @@ void ProcessSingletonNotificationCallbackImpl( return; } @@ -268,7 +268,7 @@ index b85539a24653f..48c74152428cf 100644 // The uninstall command-line switch is handled by the origin process; see // ChromeMainDelegate::PostEarlyInitialization(...). The other process won't // be able to become the singleton process and will display a window asking -@@ -843,7 +844,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { +@@ -846,7 +847,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { return content::RESULT_CODE_NORMAL_EXIT; } @@ -277,7 +277,7 @@ index b85539a24653f..48c74152428cf 100644 // If we are running stale binaries then relaunch and exit immediately. if (upgrade_util::IsRunningOldChrome()) { if (!upgrade_util::RelaunchChromeBrowser( -@@ -856,7 +857,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { +@@ -859,7 +860,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { // result in browser startup bailing. return chrome::RESULT_CODE_NORMAL_EXIT_UPGRADE_RELAUNCHED; } @@ -286,7 +286,7 @@ index b85539a24653f..48c74152428cf 100644 return load_local_state_result; } -@@ -966,7 +967,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( +@@ -969,7 +970,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( browser_process_->local_state()); platform_management_service->RefreshCache(base::NullCallback()); @@ -295,7 +295,7 @@ index b85539a24653f..48c74152428cf 100644 if (first_run::IsChromeFirstRun()) { bool stats_default; if (GoogleUpdateSettings::GetCollectStatsConsentDefault(&stats_default)) { -@@ -979,7 +980,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( +@@ -982,7 +983,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( : metrics::EnableMetricsDefault::OPT_IN); } } @@ -304,7 +304,7 @@ index b85539a24653f..48c74152428cf 100644 std::string locale = startup_data_->chrome_feature_list_creator()->actual_locale(); -@@ -1012,6 +1013,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { +@@ -1015,6 +1016,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) master_prefs_ = std::make_unique(); @@ -312,7 +312,7 @@ index b85539a24653f..48c74152428cf 100644 std::unique_ptr installer_initial_prefs = startup_data_->chrome_feature_list_creator()->TakeInitialPrefs(); if (!installer_initial_prefs) -@@ -1045,6 +1047,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { +@@ -1048,6 +1050,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { master_prefs_->confirm_to_quit); } #endif // BUILDFLAG(IS_MAC) @@ -320,7 +320,7 @@ index b85539a24653f..48c74152428cf 100644 #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) return content::RESULT_CODE_NORMAL_EXIT; } -@@ -1106,6 +1109,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1109,6 +1112,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_process_->browser_policy_connector()->OnResourceBundleCreated(); @@ -328,7 +328,7 @@ index b85539a24653f..48c74152428cf 100644 // Android does first run in Java instead of native. // Chrome OS has its own out-of-box-experience code. #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1127,6 +1131,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1130,6 +1134,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -336,7 +336,7 @@ index b85539a24653f..48c74152428cf 100644 #if BUILDFLAG(IS_MAC) #if defined(ARCH_CPU_X86_64) -@@ -1498,6 +1503,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1501,6 +1506,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { browser_process_->PreMainMessageLoopRun(); #if BUILDFLAG(IS_WIN) @@ -344,7 +344,7 @@ index b85539a24653f..48c74152428cf 100644 // If the command line specifies 'uninstall' then we need to work here // unless we detect another chrome browser running. if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUninstall)) { -@@ -1509,6 +1515,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1512,6 +1518,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { return ChromeBrowserMainPartsWin::HandleIconsCommands( *base::CommandLine::ForCurrentProcess()); } @@ -352,7 +352,7 @@ index b85539a24653f..48c74152428cf 100644 ui::SelectFileDialog::SetFactory( std::make_unique()); -@@ -1534,6 +1541,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1537,6 +1544,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { } #endif // BUILDFLAG(CHROME_FOR_TESTING) @@ -360,7 +360,7 @@ index b85539a24653f..48c74152428cf 100644 if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kMakeDefaultBrowser)) { bool is_managed = g_browser_process->local_state()->IsManagedPreference( -@@ -1547,18 +1555,22 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1550,18 +1558,22 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ? static_cast(content::RESULT_CODE_NORMAL_EXIT) : static_cast(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED); } @@ -383,7 +383,7 @@ index b85539a24653f..48c74152428cf 100644 #if !BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_DOWNGRADE_PROCESSING) // Begin relaunch processing immediately if User Data migration is required -@@ -1597,7 +1609,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1600,7 +1612,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -392,7 +392,7 @@ index b85539a24653f..48c74152428cf 100644 // Check if there is any machine level Chrome installed on the current // machine. If yes and the current Chrome process is user level, we do not // allow the user level Chrome to run. So we notify the user and uninstall -@@ -1606,7 +1618,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1609,7 +1621,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // obtained but before potentially creating the first run sentinel). if (ChromeBrowserMainPartsWin::CheckMachineLevelInstall()) return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS; @@ -401,7 +401,7 @@ index b85539a24653f..48c74152428cf 100644 // Desktop construction occurs here, (required before profile creation). PreProfileInit(); -@@ -1679,6 +1691,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1682,6 +1694,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // Call `PostProfileInit()`and set it up for profiles created later. profile_init_manager_ = std::make_unique(this, profile); @@ -409,7 +409,7 @@ index b85539a24653f..48c74152428cf 100644 #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // Execute first run specific code after the PrefService has been initialized // and preferences have been registered since some of the import code depends -@@ -1718,6 +1731,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1721,6 +1734,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { *base::CommandLine::ForCurrentProcess()); } #endif // BUILDFLAG(IS_WIN) @@ -417,7 +417,7 @@ index b85539a24653f..48c74152428cf 100644 // Configure modules that need access to resources. net::NetModule::SetResourceProvider(ChromeNetResourceProvider); -@@ -1809,6 +1823,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1812,6 +1826,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { g_browser_process->profile_manager()->GetLastOpenedProfiles(); } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -429,7 +429,7 @@ index b85539a24653f..48c74152428cf 100644 // This step is costly. if (browser_creator_->Start(*base::CommandLine::ForCurrentProcess(), base::FilePath(), profile_info, -@@ -1841,11 +1860,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1844,11 +1863,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // Create the RunLoop for MainMessageLoopRun() to use and transfer // ownership of the browser's lifetime to the BrowserProcess. @@ -654,7 +654,7 @@ index 8a96e0b26a27a..2442bf7e7f88c 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index e408ae181c2eb..8a68d4556adf8 100644 +index 921f99a4ee22d..8f059c28244cd 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -16,6 +16,7 @@ @@ -676,7 +676,7 @@ index e408ae181c2eb..8a68d4556adf8 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" -@@ -1801,7 +1806,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1813,7 +1818,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -686,7 +686,7 @@ index e408ae181c2eb..8a68d4556adf8 100644 downgrade::RegisterPrefs(registry); #endif -@@ -1854,6 +1860,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1866,6 +1872,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); @@ -698,7 +698,7 @@ index e408ae181c2eb..8a68d4556adf8 100644 } // Register prefs applicable to all profiles. -@@ -2305,6 +2316,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2317,6 +2328,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, const std::string& locale) { RegisterProfilePrefs(registry, locale); diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index e6314c010..44148cc9d 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -721,7 +721,7 @@ index 6fa57160f7193..4e10786e2c5a4 100644 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate // interface to keep these two classes decoupled and testable. diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc -index 60e7ea98b1dd2..e0c772a33ebc4 100644 +index cb14b46b727ca..eef3da9247c54 100644 --- chrome/browser/ui/views/frame/browser_view_layout.cc +++ chrome/browser/ui/views/frame/browser_view_layout.cc @@ -53,6 +53,10 @@ @@ -755,16 +755,16 @@ index 60e7ea98b1dd2..e0c772a33ebc4 100644 return gfx::Point(middle_x - size.width() / 2, top); } -@@ -162,7 +170,7 @@ class BrowserViewLayout::WebContentsModalDialogHostViews +@@ -137,7 +145,7 @@ class BrowserViewLayout::WebContentsModalDialogHostViews // universally. views::View* view = browser_view_layout_->contents_container_; gfx::Rect content_area = view->ConvertRectToWidget(view->GetLocalBounds()); - const int top = browser_view_layout_->dialog_top_y_; + const int top = GetDialogTopY(); return gfx::Size(content_area.width(), content_area.bottom() - top); - #endif } -@@ -192,6 +200,13 @@ class BrowserViewLayout::WebContentsModalDialogHostViews + +@@ -166,6 +174,13 @@ class BrowserViewLayout::WebContentsModalDialogHostViews return host_widget ? host_widget->GetNativeView() : nullptr; } @@ -778,7 +778,7 @@ index 60e7ea98b1dd2..e0c772a33ebc4 100644 // Add/remove observer. void AddObserver(ModalDialogHostObserver* observer) override { observer_list_.AddObserver(observer); -@@ -513,6 +528,8 @@ void BrowserViewLayout::Layout(views::View* browser_view) { +@@ -487,6 +502,8 @@ void BrowserViewLayout::Layout(views::View* browser_view) { if (exclusive_access_bubble) exclusive_access_bubble->RepositionIfVisible(); @@ -787,7 +787,7 @@ index 60e7ea98b1dd2..e0c772a33ebc4 100644 // Adjust any hosted dialogs if the browser's dialog hosting bounds changed. const gfx::Rect dialog_bounds(dialog_host_->GetDialogPosition(gfx::Size()), dialog_host_->GetMaximumDialogSize()); -@@ -526,6 +543,7 @@ void BrowserViewLayout::Layout(views::View* browser_view) { +@@ -500,6 +517,7 @@ void BrowserViewLayout::Layout(views::View* browser_view) { latest_dialog_bounds_in_screen_ = dialog_bounds_in_screen; dialog_host_->NotifyPositionRequiresUpdate(); } @@ -795,7 +795,7 @@ index 60e7ea98b1dd2..e0c772a33ebc4 100644 } gfx::Size BrowserViewLayout::GetPreferredSize( -@@ -667,6 +685,13 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) { +@@ -641,6 +659,13 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) { int BrowserViewLayout::LayoutToolbar(int top) { TRACE_EVENT0("ui", "BrowserViewLayout::LayoutToolbar"); diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index 07c47475f..34fedc062 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -12,7 +12,7 @@ index 44a11ec90ec9b..4c35b35a97f28 100644 # https://crbug.com/474506. "//clank/java/BUILD.gn", diff --git BUILD.gn BUILD.gn -index 097e59f46d07a..54096982660c6 100644 +index b1a8b7eaabaf4..89038f28c70c9 100644 --- BUILD.gn +++ BUILD.gn @@ -20,6 +20,7 @@ import("//build/config/sanitizers/sanitizers.gni") diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index f7bf91cfb..1065cd3f5 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 2fd13bfb778f3..84c190efdf7ac 100644 +index c2e377d5b1603..c0b1d47439f37 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -11292,6 +11292,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -11387,6 +11387,7 @@ void RenderFrameHostImpl::CommitNavigation( auto browser_calc_origin_to_commit = navigation_request->GetOriginToCommitWithDebugInfo(); if (!process_lock.is_error_page() && !is_mhtml_subframe &&