From ef03e9636ef4ed06f9a69a30745a8ae246cf599a Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 27 Oct 2023 17:21:24 +0000 Subject: [PATCH] Update to Chromium version 119.0.6045.59 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../browser_security_policy_1081397.patch | 6 +++--- patch/patches/chrome_browser_context_menus.patch | 16 ++++++++-------- patch/patches/chrome_browser_themes.patch | 6 +++--- patch/patches/rfh_navigation_4829483.patch | 4 ++-- patch/patches/services_network_2622.patch | 10 +++++----- patch/patches/webkit_popups.patch | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 368a77a9a..78e8333c0 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/119.0.6045.33', + 'chromium_checkout': 'refs/tags/119.0.6045.59', 'depot_tools_checkout': '744bfd2a7b' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 4ecce60d6..1a03adbdb 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 401eb0cd40ee2..5e7ac0b6d9d0a 100644 // Make an exception to allow most visited tiles to commit in diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index 68b50260715c2..79d9cd4558848 100644 +index 8ba07ea436976..12baff0903754 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -7463,10 +7463,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( +@@ -7464,10 +7464,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( bool use_opaque_origin = (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == network::mojom::WebSandboxFlags::kOrigin; @@ -47,7 +47,7 @@ index 68b50260715c2..79d9cd4558848 100644 } return origin_and_debug_info; -@@ -7572,6 +7584,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -7573,6 +7585,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { DetermineInitiatorRelationship(initiator_rfh, frame_tree_node_->current_frame_host())); diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 222485acf..13d539f58 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 9ed9d3b43c45b..845bb4ff858ef 100644 +index b4a12d129fa52..a8caaab873d3c 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -344,6 +344,13 @@ base::OnceCallback* GetMenuShownCallback() { +@@ -345,6 +345,13 @@ base::OnceCallback* GetMenuShownCallback() { return callback.get(); } @@ -16,7 +16,7 @@ index 9ed9d3b43c45b..845bb4ff858ef 100644 enum class UmaEnumIdLookupType { GeneralEnumId, ContextSpecificEnumId, -@@ -593,6 +600,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { +@@ -594,6 +601,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { if (ContextMenuMatcher::IsExtensionsCustomCommandId(id)) return 1; @@ -27,7 +27,7 @@ index 9ed9d3b43c45b..845bb4ff858ef 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -816,6 +827,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -817,6 +828,14 @@ RenderViewContextMenu::RenderViewContextMenu( pdf_ocr_submenu_model_ = std::make_unique(this); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) @@ -42,7 +42,7 @@ index 9ed9d3b43c45b..845bb4ff858ef 100644 observers_.AddObserver(&autofill_context_menu_manager_); } -@@ -1278,6 +1297,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1280,6 +1299,12 @@ void RenderViewContextMenu::InitMenu() { autofill::PopupHidingReason::kContextMenuOpened); } } @@ -55,7 +55,7 @@ index 9ed9d3b43c45b..845bb4ff858ef 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3334,6 +3359,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3315,6 +3340,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } @@ -69,7 +69,7 @@ index 9ed9d3b43c45b..845bb4ff858ef 100644 RenderViewContextMenu::GetHandlersForLinkUrl() { custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers = diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h -index 45f2a2a82cb03..5abee00109363 100644 +index 2d38d86a07d98..3f16e2bf696c1 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -152,6 +152,12 @@ class RenderViewContextMenu @@ -85,7 +85,7 @@ index 45f2a2a82cb03..5abee00109363 100644 protected: Profile* GetProfile() const; -@@ -437,6 +443,9 @@ class RenderViewContextMenu +@@ -441,6 +447,9 @@ class RenderViewContextMenu // built. bool is_protocol_submenu_valid_ = false; diff --git a/patch/patches/chrome_browser_themes.patch b/patch/patches/chrome_browser_themes.patch index b59b55e34..ecbf7f5d1 100644 --- a/patch/patches/chrome_browser_themes.patch +++ b/patch/patches/chrome_browser_themes.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc -index dbd628982e216..d77a39111e254 100644 +index d0e1d573c1fca..65ab5fc0a6388 100644 --- chrome/browser/themes/theme_service.cc +++ chrome/browser/themes/theme_service.cc @@ -29,6 +29,7 @@ @@ -10,7 +10,7 @@ index dbd628982e216..d77a39111e254 100644 #include "chrome/browser/browser_features.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/theme_installed_infobar_delegate.h" -@@ -69,6 +70,10 @@ +@@ -70,6 +71,10 @@ #include "ui/color/color_provider_manager.h" #include "ui/native_theme/native_theme.h" @@ -21,7 +21,7 @@ index dbd628982e216..d77a39111e254 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "base/scoped_observation.h" #include "extensions/browser/extension_registry_observer.h" -@@ -270,11 +275,19 @@ void ThemeService::Init() { +@@ -271,11 +276,19 @@ void ThemeService::Init() { // OnExtensionServiceReady. Otherwise, the ThemeObserver won't be // constructed in time to observe the corresponding events. #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index c85f56521..7e03c432e 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -12,10 +12,10 @@ index 5cb6e6463767d..84a9de1dfc6f0 100644 RenderFrameHostImpl::FromFrameToken( process_id, initiator_frame_token->value())) { diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index f9295c24641e9..118e86979c5c7 100644 +index 44ab3ea5a90eb..9962e033ab103 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -10086,6 +10086,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -10100,6 +10100,7 @@ void RenderFrameHostImpl::CommitNavigation( auto browser_calc_origin_to_commit = navigation_request->GetOriginToCommitWithDebugInfo(); if (!process_lock.is_error_page() && !is_mhtml_subframe && diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index dad2bb40b..d8ff73799 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -21,7 +21,7 @@ index 0a6c1f498b8fc..79e0cf27a7715 100644 // If the corresponding Connector policy isn't set, don't perform scans. if (!service || !service->IsConnectorEnabled(connector)) diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc -index 2d4683b149ed0..761a2216aaf63 100644 +index 6271f349464b9..caa45362f52cc 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -22,6 +22,7 @@ @@ -55,7 +55,7 @@ index 2d4683b149ed0..761a2216aaf63 100644 // Update all FPS Access Delegates on the FPS service to be `enabled`. first_party_sets::FirstPartySetsPolicyServiceFactory::GetForBrowserContext( profile_) -@@ -879,9 +885,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -881,9 +887,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->cookie_manager_params = CreateCookieManagerParams(profile_, *cookie_settings_); @@ -83,7 +83,7 @@ index 2d4683b149ed0..761a2216aaf63 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -890,15 +913,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -892,15 +915,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( local_state->GetFilePath(prefs::kDiskCacheDir); if (!disk_cache_dir.empty()) base_cache_path = disk_cache_dir.Append(base_cache_path.BaseName()); @@ -103,7 +103,7 @@ index 2d4683b149ed0..761a2216aaf63 100644 network_context_params->file_paths->data_directory = path.Append(chrome::kNetworkDataDirname); network_context_params->file_paths->unsandboxed_data_path = path; -@@ -1051,6 +1073,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -1053,6 +1075,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->block_trust_tokens = anti_abuse_content_setting == CONTENT_SETTING_BLOCK; @@ -111,7 +111,7 @@ index 2d4683b149ed0..761a2216aaf63 100644 network_context_params->first_party_sets_access_delegate_params = network::mojom::FirstPartySetsAccessDelegateParams::New(); network_context_params->first_party_sets_access_delegate_params->enabled = -@@ -1067,6 +1090,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -1069,6 +1092,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( GetForBrowserContext(profile_); DCHECK(fps_service); fps_service->AddRemoteAccessDelegate(std::move(fps_access_delegate_remote)); diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 3c8d428e6..7ecd0c572 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index 8a18ecf567cd3..9697d43bbbfb9 100644 // Cancels and hides the current popup (datetime, select...) if any. virtual void CancelPagePopup() = 0; diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc -index acb43e9f5471e..d78498411ec92 100644 +index 866af04a935f8..0223a58e5d475 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -249,8 +249,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {