From cac57a77eec367fd67c8c44bfc8adf768a935a51 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 3 Jan 2025 22:07:44 +0000 Subject: [PATCH] Update to Chromium version 132.0.6834.57 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser_context_menus.patch | 12 ++++++------ patch/patches/metrics_system_profile.patch | 4 ++-- patch/patches/rfh_navigation_4829483.patch | 6 +++--- patch/patches/web_contents_1257_1565.patch | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d2dc23790..33450261f 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.46' + 'chromium_checkout': 'refs/tags/132.0.6834.57' } diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index ad98adc83..068eef756 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 a1564ffe50f30..bfafcad73a2a2 100644 +index 3a897a52f50ca..4b8cc9027c6af 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -359,6 +359,18 @@ base::OnceCallback* GetMenuShownCallback() { +@@ -360,6 +360,18 @@ base::OnceCallback* GetMenuShownCallback() { return callback.get(); } @@ -21,7 +21,7 @@ index a1564ffe50f30..bfafcad73a2a2 100644 enum class UmaEnumIdLookupType { GeneralEnumId, ContextSpecificEnumId, -@@ -627,6 +639,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { +@@ -629,6 +641,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { return 1; } @@ -32,7 +32,7 @@ index a1564ffe50f30..bfafcad73a2a2 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -908,6 +924,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -910,6 +926,14 @@ RenderViewContextMenu::RenderViewContextMenu( : nullptr; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -47,7 +47,7 @@ index a1564ffe50f30..bfafcad73a2a2 100644 observers_.AddObserver(&autofill_context_menu_manager_); } -@@ -1364,6 +1388,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1366,6 +1390,12 @@ void RenderViewContextMenu::InitMenu() { autofill_client->HideAutofillSuggestions( autofill::SuggestionHidingReason::kContextMenuOpened); } @@ -60,7 +60,7 @@ index a1564ffe50f30..bfafcad73a2a2 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3630,6 +3660,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3650,6 +3680,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } diff --git a/patch/patches/metrics_system_profile.patch b/patch/patches/metrics_system_profile.patch index 7fd63fcf9..4609f2b61 100644 --- a/patch/patches/metrics_system_profile.patch +++ b/patch/patches/metrics_system_profile.patch @@ -1,8 +1,8 @@ diff --git components/metrics/persistent_system_profile.cc components/metrics/persistent_system_profile.cc -index 5f53ff21a358c..6d88415e889dd 100644 +index 3cef1f28ccdb0..c91c9927436de 100644 --- components/metrics/persistent_system_profile.cc +++ components/metrics/persistent_system_profile.cc -@@ -400,6 +400,10 @@ bool PersistentSystemProfile::GetSystemProfile( +@@ -401,6 +401,10 @@ bool PersistentSystemProfile::GetSystemProfile( return true; } diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index 878ef7c00..a2d3738a7 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 c77216fb7f109..c390b90c5bea7 100644 +index f58b9b0333e01..62cc5a6ef62a7 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -9169,6 +9169,16 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9197,6 +9197,16 @@ void RenderFrameHostImpl::CreateNewWindow( return; } @@ -19,7 +19,7 @@ index c77216fb7f109..c390b90c5bea7 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. -@@ -11547,6 +11557,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -11560,6 +11570,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 a8cb5b25e..efed69ee9 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 ea5a63ce49a1e..b2ce9614170c3 100644 +index 03b5291540931..e5abe380e2c74 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -3758,6 +3758,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -33,7 +33,7 @@ index ea5a63ce49a1e..b2ce9614170c3 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -4851,6 +4861,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4853,6 +4863,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -49,7 +49,7 @@ index ea5a63ce49a1e..b2ce9614170c3 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. -@@ -9314,6 +9333,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -9316,6 +9335,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, } CloseListenerManager::DidChangeFocusedFrame(this);