From f9c2d00bf21314ab6123bd51e2cf426e6908f76c Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 24 Mar 2025 17:53:11 +0000 Subject: [PATCH] Update to Chromium version 135.0.7049.28 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser_context_menus.patch | 4 ++-- patch/patches/chrome_browser_download.patch | 2 +- patch/patches/chrome_browser_safe_browsing.patch | 2 +- patch/patches/chrome_runtime.patch | 6 +++--- patch/patches/content_2015.patch | 4 ++-- patch/patches/views_1749_2102_3330.patch | 2 +- patch/patches/web_contents_1257_1565.patch | 12 ++++++------ 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d20c479f3..5454f9563 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/135.0.7049.17' + 'chromium_checkout': 'refs/tags/135.0.7049.28' } diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 60440c4bc..8e73ac3ac 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -136,7 +136,7 @@ index cb51224f9892c..b5a3946999d8f 100644 private: // RenderViewContextMenuViewsMac: diff --git chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm -index 2e34cf104fbe6..850489d12a458 100644 +index 5e266a42d3df6..e57211944d6a6 100644 --- chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm +++ chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_cocoa.mm @@ -70,6 +70,10 @@ RenderViewContextMenuMacCocoa::~RenderViewContextMenuMacCocoa() { @@ -150,7 +150,7 @@ index 2e34cf104fbe6..850489d12a458 100644 views::Widget* widget = views::Widget::GetTopLevelWidgetForNativeView( source_web_contents_->GetNativeView()); -@@ -94,6 +98,10 @@ void RenderViewContextMenuMacCocoa::Show() { +@@ -95,6 +99,10 @@ void RenderViewContextMenuMacCocoa::Show() { views::ElementTrackerViews::GetContextForWidget(widget)); } diff --git a/patch/patches/chrome_browser_download.patch b/patch/patches/chrome_browser_download.patch index 84d727c56..05c72c16f 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 cfcae9fc073be..b8c140692facc 100644 +index f960decad09fb..b1e88137ff284 100644 --- chrome/browser/download/chrome_download_manager_delegate.cc +++ chrome/browser/download/chrome_download_manager_delegate.cc @@ -30,6 +30,7 @@ diff --git a/patch/patches/chrome_browser_safe_browsing.patch b/patch/patches/chrome_browser_safe_browsing.patch index f9fd95da3..ede9ddf57 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 2fccae1ba5b02..470b8d8b3fae3 100644 +index 9d712eab8c753..33807ed8f35bc 100644 --- chrome/browser/safe_browsing/BUILD.gn +++ chrome/browser/safe_browsing/BUILD.gn @@ -38,6 +38,7 @@ static_library("safe_browsing") { diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 2ae921b25..4223dd979 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -433,7 +433,7 @@ index e26e3625c99c8..c0d4a95607e37 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index c9d3bbcf2a0b1..2dd6a7ecf6a84 100644 +index 2e672ca49c04c..a3acfecc15898 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -47,6 +47,7 @@ @@ -529,7 +529,7 @@ index c9d3bbcf2a0b1..2dd6a7ecf6a84 100644 base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired, weak_factory_.GetWeakPtr(), diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h -index 2b5748cd55d4c..c80ed07d3b623 100644 +index 6642110b906e1..691ab69fe0757 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -159,6 +159,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -550,7 +550,7 @@ index 2b5748cd55d4c..c80ed07d3b623 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1343,7 +1345,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -1345,7 +1347,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { #if !BUILDFLAG(IS_ANDROID) uint64_t num_keepalive_requests_ = 0; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index d4576b001..cd8c8069b 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -47,7 +47,7 @@ index 8e47cbb36a8cb..5165aea10332e 100644 return std::make_pair( /*is_cacheable=*/false, diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index eacc673508fde..86a9600c75188 100644 +index 79490d0d3d622..537ac2d9763e6 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -1166,7 +1166,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( @@ -68,7 +68,7 @@ index eacc673508fde..86a9600c75188 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 9746621c4fa96..ef3fa93b6b917 100644 +index f0ac298846f7e..75ee3b0e6df86 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -1360,6 +1360,12 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patch/patches/views_1749_2102_3330.patch b/patch/patches/views_1749_2102_3330.patch index c70f319a8..3b3709d2a 100644 --- a/patch/patches/views_1749_2102_3330.patch +++ b/patch/patches/views_1749_2102_3330.patch @@ -654,7 +654,7 @@ index f5b0936aac647..20f476c9abd93 100644 std::optional show_menu_host_duration_histogram) override; void Cancel() override; diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm -index 05322e627acab..a866a76c50372 100644 +index e1e3f0d4c54dd..f8afecca2016b 100644 --- ui/views/controls/menu/menu_runner_impl_cocoa.mm +++ ui/views/controls/menu/menu_runner_impl_cocoa.mm @@ -72,6 +72,7 @@ void MenuRunnerImplCocoa::RunMenuAt( diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index c8d810cae..82c397581 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 b45b3210c9564..76b6c52347b73 100644 +index ec7e2a566b879..3e7140cdbd26e 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -3853,6 +3853,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3861,6 +3861,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 b45b3210c9564..76b6c52347b73 100644 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3863,6 +3869,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3871,6 +3877,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } @@ -23,7 +23,7 @@ index b45b3210c9564..76b6c52347b73 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -4073,6 +4080,9 @@ void WebContentsImpl::RenderWidgetCreated( +@@ -4081,6 +4088,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 b45b3210c9564..76b6c52347b73 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -4992,6 +5002,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5000,6 +5010,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -49,7 +49,7 @@ index b45b3210c9564..76b6c52347b73 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. -@@ -9660,6 +9679,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -9687,6 +9706,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, } CloseListenerManager::DidChangeFocusedFrame(this);