From 40b21a958339cb00de9509af1e3297e197f985c1 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 21 Nov 2024 14:41:08 +0000 Subject: [PATCH] Update to Chromium version 132.0.6834.15 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../browser_security_policy_1081397.patch | 6 +++--- patch/patches/chrome_browser.patch | 4 ++-- patch/patches/chrome_browser_download.patch | 4 ++-- patch/patches/chrome_browser_safe_browsing.patch | 2 +- patch/patches/chrome_runtime_views.patch | 14 +++++++------- patch/patches/rfh_navigation_4829483.patch | 6 +++--- patch/patches/web_contents_1257_1565.patch | 16 ++++++++-------- patch/patches/webkit_popups.patch | 8 ++++---- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 461d263d7..f77ec348c 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/132.0.6834.6' + 'chromium_checkout': 'refs/tags/132.0.6834.15' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 248b61aed..353c06f57 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index d4d1572304587..35fa3abc12213 100644 // Make an exception to allow most visited tiles to commit in third-party diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index f8e18b15a1951..68c9991a962f7 100644 +index 4f76cfa33ea68..1cc33c7bb9e4f 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -8255,10 +8255,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( +@@ -8259,10 +8259,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( bool use_opaque_origin = (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == network::mojom::WebSandboxFlags::kOrigin; @@ -47,7 +47,7 @@ index f8e18b15a1951..68c9991a962f7 100644 } return origin_and_debug_info; -@@ -8366,11 +8378,20 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -8370,11 +8382,20 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { DetermineInitiatorRelationship(initiator_rfh, frame_tree_node_->current_frame_host())); diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 3c454c16f..f81188736 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 1a136cdeb8aea..27238c9fccc56 100644 +index 3914cb63eed91..f0dc36529a3c9 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -18,7 +18,7 @@ index 1a136cdeb8aea..27238c9fccc56 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2508,6 +2510,10 @@ static_library("browser") { +@@ -2507,6 +2509,10 @@ static_library("browser") { sources += [ "net/net_error_diagnostics_dialog_stub.cc" ] } diff --git a/patch/patches/chrome_browser_download.patch b/patch/patches/chrome_browser_download.patch index 08748c7cb..fd63a8066 100644 --- a/patch/patches/chrome_browser_download.patch +++ b/patch/patches/chrome_browser_download.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/download/chrome_download_manager_delegate.cc chrome/browser/download/chrome_download_manager_delegate.cc -index e07f9d6b5aabd..f57b5da7e9364 100644 +index 16f38b6c8d6f9..97f54931c02dd 100644 --- chrome/browser/download/chrome_download_manager_delegate.cc +++ chrome/browser/download/chrome_download_manager_delegate.cc @@ -31,6 +31,7 @@ @@ -56,7 +56,7 @@ index e07f9d6b5aabd..f57b5da7e9364 100644 DownloadTargetDeterminer::CompletionCallback target_determined_callback = base::BindOnce(&ChromeDownloadManagerDelegate::OnDownloadTargetDetermined, weak_ptr_factory_.GetWeakPtr(), download->GetId(), -@@ -1119,8 +1138,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { +@@ -1120,8 +1139,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { Browser* browser = web_contents ? chrome::FindBrowserWithTab(web_contents) : nullptr; std::unique_ptr browser_displayer; diff --git a/patch/patches/chrome_browser_safe_browsing.patch b/patch/patches/chrome_browser_safe_browsing.patch index 14e7eeed1..3151eebf6 100644 --- a/patch/patches/chrome_browser_safe_browsing.patch +++ b/patch/patches/chrome_browser_safe_browsing.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn -index 949f93a7b032a..1c32ec4aa0b84 100644 +index ba573c282402e..216d702ee65b8 100644 --- chrome/browser/safe_browsing/BUILD.gn +++ chrome/browser/safe_browsing/BUILD.gn @@ -39,6 +39,7 @@ static_library("safe_browsing") { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 5152f4bbf..d474139cc 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -41,10 +41,10 @@ index ec7c90dc23958..0fa7a7110cf43 100644 void BrowserCommandController::InitCommandState() { diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc -index 5d09d33c4a730..205a4fbb6abe3 100644 +index 0d4b0fb263538..cdc472aa9f997 100644 --- chrome/browser/ui/toolbar/app_menu_model.cc +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -714,10 +714,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel( +@@ -715,10 +715,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel( ui::SimpleMenuModel::Delegate* delegate) : SimpleMenuModel(delegate) { AddItemWithStringIdAndVectorIcon(this, IDC_FIND, IDS_FIND, kSearchMenuIcon); @@ -57,7 +57,7 @@ index 5d09d33c4a730..205a4fbb6abe3 100644 } class SaveAndShareSubMenuModel : public ui::SimpleMenuModel { -@@ -782,6 +784,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( +@@ -783,6 +785,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( } } @@ -115,7 +115,7 @@ index 5d09d33c4a730..205a4fbb6abe3 100644 } // namespace //////////////////////////////////////////////////////////////////////////////// -@@ -1696,7 +1749,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { +@@ -1699,7 +1752,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { return false; } @@ -124,7 +124,7 @@ index 5d09d33c4a730..205a4fbb6abe3 100644 GlobalError* error = GlobalErrorServiceFactory::GetForProfile(browser_->profile()) ->GetGlobalErrorByMenuItemCommandID(command_id); -@@ -1712,6 +1765,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { +@@ -1715,6 +1768,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { } } @@ -155,7 +155,7 @@ index 5d09d33c4a730..205a4fbb6abe3 100644 bool AppMenuModel::IsCommandIdAlerted(int command_id) const { if (command_id == IDC_VIEW_PASSWORDS || command_id == IDC_SHOW_PASSWORD_MANAGER) { -@@ -1868,8 +1945,10 @@ void AppMenuModel::Build() { +@@ -1871,8 +1948,10 @@ void AppMenuModel::Build() { IDS_CLEAR_BROWSING_DATA, kTrashCanRefreshIcon); @@ -166,7 +166,7 @@ index 5d09d33c4a730..205a4fbb6abe3 100644 AddSeparator(ui::NORMAL_SEPARATOR); AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon); -@@ -1965,6 +2044,11 @@ void AppMenuModel::Build() { +@@ -1968,6 +2047,11 @@ void AppMenuModel::Build() { } #endif // !BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index 453435ad3..56fa14406 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 d29dac8938055..c2bbba0d6c2ab 100644 +index 95b2ad64c8336..bad7c4bcbe695 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -9180,6 +9180,16 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9189,6 +9189,16 @@ void RenderFrameHostImpl::CreateNewWindow( return; } @@ -19,7 +19,7 @@ index d29dac8938055..c2bbba0d6c2ab 100644 // Otherwise, consume user activation before we proceed. In particular, it is // important to do this before we return from the |opener_suppressed| case // below. -@@ -11558,6 +11568,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -11567,6 +11577,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/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index c781384ff..a8cb5b25e 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index c93722f2fc534..aa48180f8e470 100644 +index ea5a63ce49a1e..b2ce9614170c3 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -3754,6 +3754,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3758,6 +3758,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, params.main_frame_name, GetOpener(), primary_main_frame_policy, base::UnguessableToken::Create()); @@ -15,7 +15,7 @@ index c93722f2fc534..aa48180f8e470 100644 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3764,6 +3770,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3768,6 +3774,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } @@ -23,7 +23,7 @@ index c93722f2fc534..aa48180f8e470 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -3962,6 +3969,9 @@ void WebContentsImpl::RenderWidgetCreated( +@@ -3966,6 +3973,9 @@ void WebContentsImpl::RenderWidgetCreated( "render_widget_host", render_widget_host); CHECK(!created_widgets_.contains(render_widget_host->GetFrameSinkId())); created_widgets_[render_widget_host->GetFrameSinkId()] = render_widget_host; @@ -33,7 +33,7 @@ index c93722f2fc534..aa48180f8e470 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -4847,6 +4857,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4851,6 +4861,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -49,7 +49,7 @@ index c93722f2fc534..aa48180f8e470 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. -@@ -9305,6 +9324,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -9314,6 +9333,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, } CloseListenerManager::DidChangeFocusedFrame(this); @@ -60,7 +60,7 @@ index c93722f2fc534..aa48180f8e470 100644 FrameTree* WebContentsImpl::GetOwnedPictureInPictureFrameTree() { diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index 825e0d9d641bf..13954b3f5b45c 100644 +index 191a98adec4cc..2350fe1139fe4 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -111,10 +111,12 @@ class BrowserPluginGuestDelegate; @@ -119,7 +119,7 @@ index 77ee6ba6c65c9..59f7c8cc58b60 100644 // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h -index 0379a5ca835e3..950c4a8d8e508 100644 +index f3284b11c2a9d..f10a23e765c1c 100644 --- content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h @@ -244,6 +244,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver { diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 47d308cc0..376a2ee47 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index 083af135d890c..799ef161a493a 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 f5fe2e0614486..58d48b08dec6d 100644 +index ad134361e0b9c..374faaa1464f2 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -257,8 +257,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -39,7 +39,7 @@ index f5fe2e0614486..58d48b08dec6d 100644 fullscreen_controller_(std::make_unique(this)), page_base_background_color_( diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h -index d5397c53559ba..ae75834087808 100644 +index e4784453b357e..5dbbd3cd073d2 100644 --- third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h @@ -140,7 +140,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -52,7 +52,7 @@ index d5397c53559ba..ae75834087808 100644 // Returns whether frames under this WebView are backed by a compositor. bool does_composite() const { return does_composite_; } -@@ -877,6 +878,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -880,6 +881,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, float fake_page_scale_animation_page_scale_factor_ = 0.f; bool fake_page_scale_animation_use_anchor_ = false; @@ -62,7 +62,7 @@ index d5397c53559ba..ae75834087808 100644 gfx::Transform device_emulation_transform_; diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc -index 9326028540aae..6f2eb37355383 100644 +index d07cb090ec4b1..4a684b4df186e 100644 --- third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc @@ -971,7 +971,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,