From 56f1033fd94a8187c662eb4c2174c886946bcc9b Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 8 Feb 2024 15:01:12 +0000 Subject: [PATCH] Update to Chromium version 122.0.6261.29 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/blink_web_element_4200240.patch | 2 +- patch/patches/chrome_browser.patch | 2 +- patch/patches/chrome_browser_context_menus.patch | 4 ++-- patch/patches/chrome_runtime.patch | 8 ++++---- patch/patches/chrome_runtime_views.patch | 16 ++++++++-------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d2efd3628..428593368 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/122.0.6261.18', + 'chromium_checkout': 'refs/tags/122.0.6261.29', 'depot_tools_checkout': '10bd39fd47' } diff --git a/patch/patches/blink_web_element_4200240.patch b/patch/patches/blink_web_element_4200240.patch index 1839bd44c..8d761eb7f 100644 --- a/patch/patches/blink_web_element_4200240.patch +++ b/patch/patches/blink_web_element_4200240.patch @@ -13,7 +13,7 @@ index 9cd08e8b26410..d2dca33bdc62e 100644 // Returns true if the element's contenteditable attribute is in the true // state or in the plaintext-only state: diff --git third_party/blink/renderer/core/exported/web_element.cc third_party/blink/renderer/core/exported/web_element.cc -index 0c2400696ecbc..3dd6e5574eb39 100644 +index 5cc36b7dccab4..05c9a46e3db69 100644 --- third_party/blink/renderer/core/exported/web_element.cc +++ third_party/blink/renderer/core/exported/web_element.cc @@ -116,6 +116,24 @@ void WebElement::SetAttribute(const WebString& attr_name, diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index ef3219954..1c88f6d66 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 81dceec0b449c..ca76a507bb657 100644 +index 0e613a31e6a42..93762ff8b7adb 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_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 4cf2d9c8e..e2f4b0f08 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 37b1cdbab20c4..5f4eae9a103cb 100644 +index 5ebec17f77393..f94c18f8de78e 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -360,6 +360,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -55,7 +55,7 @@ index 37b1cdbab20c4..5f4eae9a103cb 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3526,6 +3551,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3515,6 +3540,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index e724baa2c..6db278a32 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -384,7 +384,7 @@ index 7c438a75e086c..f3088e0e6d564 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index c8f705069d25b..aa9e0fd6efd0e 100644 +index 8e21b0a1e691a..e524270db738a 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -46,6 +46,7 @@ @@ -446,7 +446,7 @@ index c8f705069d25b..aa9e0fd6efd0e 100644 } std::vector -@@ -7535,10 +7547,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -7539,10 +7551,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -459,7 +459,7 @@ index c8f705069d25b..aa9e0fd6efd0e 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7557,7 +7569,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7561,7 +7573,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -469,7 +469,7 @@ index c8f705069d25b..aa9e0fd6efd0e 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7699,7 +7712,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7703,7 +7716,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index dbaaeccad..5a63415b2 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -941,10 +941,10 @@ index c592f23b0c972..adca2e8db1cc6 100644 } diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc -index 0cf2fbd962501..ccdc0a92ccde1 100644 +index e6aca6cbb09e8..7e16d8b75fd39 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -191,7 +191,7 @@ class TabstripLikeBackground : public views::Background { +@@ -192,7 +192,7 @@ class TabstripLikeBackground : public views::Background { void Paint(gfx::Canvas* canvas, views::View* view) const override { bool painted = TopContainerBackground::PaintThemeCustomImage(canvas, view, browser_view_); @@ -953,7 +953,7 @@ index 0cf2fbd962501..ccdc0a92ccde1 100644 SkColor frame_color = browser_view_->frame()->GetFrameView()->GetFrameColor( BrowserFrameActiveState::kUseCurrent); -@@ -220,12 +220,13 @@ END_METADATA +@@ -221,12 +221,13 @@ END_METADATA //////////////////////////////////////////////////////////////////////////////// // ToolbarView, public: @@ -969,7 +969,7 @@ index 0cf2fbd962501..ccdc0a92ccde1 100644 SetID(VIEW_ID_TOOLBAR); container_view_ = AddChildView(std::make_unique()); -@@ -250,6 +251,19 @@ ToolbarView::~ToolbarView() { +@@ -251,6 +252,19 @@ ToolbarView::~ToolbarView() { } void ToolbarView::Init() { @@ -989,7 +989,7 @@ index 0cf2fbd962501..ccdc0a92ccde1 100644 #if defined(USE_AURA) // Avoid generating too many occlusion tracking calculation events before this // function returns. The occlusion status will be computed only once once this -@@ -274,12 +288,12 @@ void ToolbarView::Init() { +@@ -275,12 +289,12 @@ void ToolbarView::Init() { auto location_bar = std::make_unique( browser_, browser_->profile(), browser_->command_controller(), this, @@ -1004,7 +1004,7 @@ index 0cf2fbd962501..ccdc0a92ccde1 100644 download_button = std::make_unique(browser_view_); } -@@ -361,8 +375,10 @@ void ToolbarView::Init() { +@@ -362,8 +376,10 @@ void ToolbarView::Init() { } } std::unique_ptr cast; @@ -1016,7 +1016,7 @@ index 0cf2fbd962501..ccdc0a92ccde1 100644 std::unique_ptr media_button; if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) { -@@ -372,7 +388,8 @@ void ToolbarView::Init() { +@@ -373,7 +389,8 @@ void ToolbarView::Init() { std::unique_ptr send_tab_to_self_button; @@ -1026,7 +1026,7 @@ index 0cf2fbd962501..ccdc0a92ccde1 100644 send_tab_to_self_button = std::make_unique( browser_view_); -@@ -451,7 +468,7 @@ void ToolbarView::Init() { +@@ -452,7 +469,7 @@ void ToolbarView::Init() { send_tab_to_self_button_ = container_view_->AddChildView(std::move(send_tab_to_self_button));