From 50eaaaacd653775ee655e6a9cc11703e42e470a5 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 17 Jan 2024 15:13:16 +0000 Subject: [PATCH] Update to Chromium version 120.0.6099.234 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser.patch | 2 +- patch/patches/chrome_runtime.patch | 40 +++++++++++----------- patch/patches/web_contents_1257_1565.patch | 8 ++--- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 6e8fb9174..834b60717 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/120.0.6099.216', + 'chromium_checkout': 'refs/tags/120.0.6099.234', 'depot_tools_checkout': 'f01ca5848d' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 205e777cb..9b377e8f5 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 44d3b5e543101..07af0af8b2330 100644 +index cd46c4c79d476..abe86611394a6 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 18905c654..11185c22a 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -135,7 +135,7 @@ index 176b6248f18e8..1360e8c209eba 100644 #if BUILDFLAG(IS_CHROMEOS_LACROS) std::unique_ptr lacros_service_; diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc -index e819129536dc0..e9287f6e03a88 100644 +index 6354e94fc85e1..3e1478bb43412 100644 --- chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc @@ -52,6 +52,7 @@ @@ -155,7 +155,7 @@ index e819129536dc0..e9287f6e03a88 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 -@@ -774,7 +775,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { +@@ -772,7 +773,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { return content::RESULT_CODE_NORMAL_EXIT; } @@ -164,7 +164,7 @@ index e819129536dc0..e9287f6e03a88 100644 // If we are running stale binaries then relaunch and exit immediately. if (upgrade_util::IsRunningOldChrome()) { if (!upgrade_util::RelaunchChromeBrowser( -@@ -787,7 +788,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { +@@ -785,7 +786,7 @@ int ChromeBrowserMainParts::PreEarlyInitialization() { // result in browser startup bailing. return chrome::RESULT_CODE_NORMAL_EXIT_UPGRADE_RELAUNCHED; } @@ -173,7 +173,7 @@ index e819129536dc0..e9287f6e03a88 100644 return load_local_state_result; } -@@ -889,7 +890,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( +@@ -887,7 +888,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( browser_process_->local_state()); platform_management_service->RefreshCache(base::NullCallback()); @@ -182,7 +182,7 @@ index e819129536dc0..e9287f6e03a88 100644 if (first_run::IsChromeFirstRun()) { bool stats_default; if (GoogleUpdateSettings::GetCollectStatsConsentDefault(&stats_default)) { -@@ -902,7 +903,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( +@@ -900,7 +901,7 @@ int ChromeBrowserMainParts::OnLocalStateLoaded( : metrics::EnableMetricsDefault::OPT_IN); } } @@ -191,7 +191,7 @@ index e819129536dc0..e9287f6e03a88 100644 std::string locale = startup_data_->chrome_feature_list_creator()->actual_locale(); -@@ -935,6 +936,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { +@@ -933,6 +934,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) master_prefs_ = std::make_unique(); @@ -199,7 +199,7 @@ index e819129536dc0..e9287f6e03a88 100644 std::unique_ptr installer_initial_prefs = startup_data_->chrome_feature_list_creator()->TakeInitialPrefs(); if (!installer_initial_prefs) -@@ -968,6 +970,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { +@@ -966,6 +968,7 @@ int ChromeBrowserMainParts::ApplyFirstRunPrefs() { master_prefs_->confirm_to_quit); } #endif // BUILDFLAG(IS_MAC) @@ -207,7 +207,7 @@ index e819129536dc0..e9287f6e03a88 100644 #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) return content::RESULT_CODE_NORMAL_EXIT; } -@@ -1032,6 +1035,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1030,6 +1033,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_process_->browser_policy_connector()->OnResourceBundleCreated(); @@ -215,7 +215,7 @@ index e819129536dc0..e9287f6e03a88 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) -@@ -1053,6 +1057,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1051,6 +1055,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -223,7 +223,7 @@ index e819129536dc0..e9287f6e03a88 100644 #if BUILDFLAG(IS_CHROMEOS) // Set the product channel for crash reports. -@@ -1417,6 +1422,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1415,6 +1420,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { browser_process_->PreMainMessageLoopRun(); #if BUILDFLAG(IS_WIN) @@ -231,7 +231,7 @@ index e819129536dc0..e9287f6e03a88 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)) { -@@ -1428,6 +1434,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1426,6 +1432,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { return ChromeBrowserMainPartsWin::HandleIconsCommands( *base::CommandLine::ForCurrentProcess()); } @@ -239,7 +239,7 @@ index e819129536dc0..e9287f6e03a88 100644 ui::SelectFileDialog::SetFactory( std::make_unique()); -@@ -1445,6 +1452,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1443,6 +1450,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -247,7 +247,7 @@ index e819129536dc0..e9287f6e03a88 100644 if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kMakeDefaultBrowser)) { bool is_managed = g_browser_process->local_state()->IsManagedPreference( -@@ -1458,18 +1466,22 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1456,18 +1464,22 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { ? static_cast(content::RESULT_CODE_NORMAL_EXIT) : static_cast(chrome::RESULT_CODE_SHELL_INTEGRATION_FAILED); } @@ -270,7 +270,7 @@ index e819129536dc0..e9287f6e03a88 100644 #if !BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_DOWNGRADE_PROCESSING) // Begin relaunch processing immediately if User Data migration is required -@@ -1508,7 +1520,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1506,7 +1518,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -279,7 +279,7 @@ index e819129536dc0..e9287f6e03a88 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 -@@ -1517,7 +1529,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1515,7 +1527,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // obtained but before potentially creating the first run sentinel). if (ChromeBrowserMainPartsWin::CheckMachineLevelInstall()) return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS; @@ -288,7 +288,7 @@ index e819129536dc0..e9287f6e03a88 100644 // Desktop construction occurs here, (required before profile creation). PreProfileInit(); -@@ -1560,12 +1572,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1558,12 +1570,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { browser_process_->local_state()); } @@ -303,7 +303,7 @@ index e819129536dc0..e9287f6e03a88 100644 #if BUILDFLAG(IS_ANDROID) page_info::SetPageInfoClient(new ChromePageInfoClient()); -@@ -1592,6 +1606,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1590,6 +1604,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // Call `PostProfileInit()`and set it up for profiles created later. profile_init_manager_ = std::make_unique(this, profile); @@ -311,7 +311,7 @@ index e819129536dc0..e9287f6e03a88 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 -@@ -1631,6 +1646,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1629,6 +1644,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { *base::CommandLine::ForCurrentProcess()); } #endif // BUILDFLAG(IS_WIN) @@ -319,7 +319,7 @@ index e819129536dc0..e9287f6e03a88 100644 // Configure modules that need access to resources. net::NetModule::SetResourceProvider(ChromeNetResourceProvider); -@@ -1711,6 +1727,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1709,6 +1725,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -330,7 +330,7 @@ index e819129536dc0..e9287f6e03a88 100644 // This step is costly and is already measured in // Startup.StartupBrowserCreator_Start. if (browser_creator_->Start(*base::CommandLine::ForCurrentProcess(), -@@ -1744,11 +1764,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1742,11 +1762,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // Create the RunLoop for MainMessageLoopRun() to use and transfer // ownership of the browser's lifetime to the BrowserProcess. diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 364852055..b6d59c0fa 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 63eafd910dad5..1abd7d266c244 100644 +index dba3fa7b487fe..c58c06ae73bda 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -3448,6 +3448,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -33,7 +33,7 @@ index 63eafd910dad5..1abd7d266c244 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -3984,6 +3994,10 @@ void WebContentsImpl::Restore() { +@@ -3989,6 +3999,10 @@ void WebContentsImpl::Restore() { ui::WindowShowState WebContentsImpl::GetWindowShowState() { #if defined(USE_AURA) aura::Window* window = GetTopLevelNativeWindow(); @@ -44,7 +44,7 @@ index 63eafd910dad5..1abd7d266c244 100644 return wm::GetWindowState(window); #else // TODO(laurila, crbug.com/1466855): This API function currently works only on -@@ -4451,6 +4465,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4456,6 +4470,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -60,7 +60,7 @@ index 63eafd910dad5..1abd7d266c244 100644 // Check whether there is an available prerendered page for this navigation if // this is not for guest. If it exists, take WebContents pre-created for // hosting the prerendered page instead of creating new WebContents. -@@ -8599,6 +8622,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -8604,6 +8627,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, } CloseListenerManager::DidChangeFocusedFrame(this);