From 41036f7624c25bd68f3277edd2dfa39488c01287 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 9 Apr 2024 18:40:59 -0400 Subject: [PATCH] Update to Chromium version 124.0.6367.29 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/chrome_browser_browser.patch | 4 ++-- .../chrome_browser_dialogs_widget.patch | 8 +++---- patch/patches/chrome_runtime.patch | 16 ++++++------- patch/patches/content_main_654986.patch | 24 +++++++++---------- patch/patches/views_widget.patch | 12 +++++----- 6 files changed, 32 insertions(+), 34 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 4d45dc76c..b263248a0 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/124.0.6367.18', + 'chromium_checkout': 'refs/tags/124.0.6367.29', 'depot_tools_checkout': 'a46e95ea68' } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index aaa2fca65..73933c173 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -75,7 +75,7 @@ index c5eea1036e1eb..d102fff3e9de8 100644 } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 3fe3d6eddbf01..b1549c86523be 100644 +index 343094ba0f527..db650e2da3698 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni") @@ -123,7 +123,7 @@ index 3fe3d6eddbf01..b1549c86523be 100644 "views/apps/app_info_dialog/app_info_dialog_container.cc", "views/apps/app_info_dialog/app_info_dialog_container.h", "views/apps/app_info_dialog/app_info_dialog_views.cc", -@@ -6813,6 +6819,7 @@ static_library("ui") { +@@ -6814,6 +6820,7 @@ static_library("ui") { if (enable_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_browser_dialogs_widget.patch b/patch/patches/chrome_browser_dialogs_widget.patch index 14716584e..71496e830 100644 --- a/patch/patches/chrome_browser_dialogs_widget.patch +++ b/patch/patches/chrome_browser_dialogs_widget.patch @@ -178,7 +178,7 @@ index 51ed6bcf6b540..c6e1161140655 100644 virtual gfx::Point GetDialogPosition(const gfx::Size& size) = 0; // Returns whether a dialog currently about to be shown should be activated. diff --git ui/views/window/dialog_delegate.cc ui/views/window/dialog_delegate.cc -index 992dbc606ab78..2361727757696 100644 +index 8bc19c1b67810..afe301287e2e0 100644 --- ui/views/window/dialog_delegate.cc +++ ui/views/window/dialog_delegate.cc @@ -60,10 +60,12 @@ DialogDelegate::DialogDelegate() { @@ -247,10 +247,10 @@ index 992dbc606ab78..2361727757696 100644 // Web-modal (ui::MODAL_TYPE_CHILD) dialogs with parents are marked as child // widgets to prevent top-level window behavior (independent movement, etc). diff --git ui/views/window/dialog_delegate.h ui/views/window/dialog_delegate.h -index bfeb88bc9b666..6dd74a72e20cc 100644 +index de642a3bc1101..bdd8664f481a9 100644 --- ui/views/window/dialog_delegate.h +++ ui/views/window/dialog_delegate.h -@@ -96,13 +96,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate { +@@ -97,13 +97,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate { // your use case. static Widget* CreateDialogWidget(std::unique_ptr delegate, gfx::NativeWindow context, @@ -272,7 +272,7 @@ index bfeb88bc9b666..6dd74a72e20cc 100644 // Returns the dialog widget InitParams for a given |context| or |parent|. // If |bounds| is not empty, used to initially place the dialog, otherwise -@@ -110,7 +115,9 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate { +@@ -111,7 +116,9 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate { static Widget::InitParams GetDialogWidgetInitParams(WidgetDelegate* delegate, gfx::NativeWindow context, gfx::NativeView parent, diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 9630ac0ac..4c4923efc 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -384,7 +384,7 @@ index 2f0fe9d22667c..f50fe7bf75df3 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 011ffe3477b67..e56c0581ab844 100644 +index ac42bd8b0c899..b82517b3e52f9 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -47,6 +47,7 @@ @@ -416,7 +416,7 @@ index 011ffe3477b67..e56c0581ab844 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -3612,9 +3620,24 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs, +@@ -3624,9 +3632,24 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs, : blink::mojom::PreferredColorScheme::kLight; } #else @@ -442,7 +442,7 @@ index 011ffe3477b67..e56c0581ab844 100644 #endif // BUILDFLAG(IS_ANDROID) // Reauth WebUI doesn't support dark mode yet because it shares the dialog -@@ -4360,9 +4383,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4372,9 +4395,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -454,7 +454,7 @@ index 011ffe3477b67..e56c0581ab844 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6469,7 +6494,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6481,7 +6506,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( #endif } @@ -463,7 +463,7 @@ index 011ffe3477b67..e56c0581ab844 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6487,6 +6512,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6499,6 +6524,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -472,7 +472,7 @@ index 011ffe3477b67..e56c0581ab844 100644 } std::vector -@@ -7612,10 +7639,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -7624,10 +7651,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -485,7 +485,7 @@ index 011ffe3477b67..e56c0581ab844 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7634,7 +7661,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7646,7 +7673,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -495,7 +495,7 @@ index 011ffe3477b67..e56c0581ab844 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7774,7 +7802,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7786,7 +7814,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/content_main_654986.patch b/patch/patches/content_main_654986.patch index a6cf7de6d..170686625 100644 --- a/patch/patches/content_main_654986.patch +++ b/patch/patches/content_main_654986.patch @@ -12,7 +12,7 @@ index 79ba3ac1913f8..46bcb4366d2f8 100644 if (main_argv) setproctitle_init(main_argv); diff --git content/app/content_main.cc content/app/content_main.cc -index ffbb5986ca997..3c24cb27d3c12 100644 +index fe6ffe9a1b9b3..83b682cc75b91 100644 --- content/app/content_main.cc +++ content/app/content_main.cc @@ -175,11 +175,8 @@ ContentMainParams::~ContentMainParams() = default; @@ -63,25 +63,23 @@ index ffbb5986ca997..3c24cb27d3c12 100644 command_line->AppendSwitch(switches::kInProcessGPU); command_line->AppendSwitch(switches::kEnableViewport); command_line->AppendSwitch(switches::kUseMobileUserAgent); -@@ -308,19 +295,20 @@ RunContentProcess(ContentMainParams params, +@@ -307,19 +294,20 @@ RunContentProcess(ContentMainParams params, + } #if BUILDFLAG(IS_WIN) - // Route stdio to parent console (if any) or create one. -- if (base::CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kEnableLogging)) { +- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kHeadless)) { + // When running in headless mode we want stdio routed however if + // console does not exist we should not create one. + base::RouteStdioToConsole(/*create_console_if_not_found*/ false); + } else if (command_line->HasSwitch(switches::kEnableLogging)) { +- // Route stdio to parent console (if any) or create one. - base::RouteStdioToConsole(/*create_console_if_not_found*/ true); -- } else if (base::CommandLine::ForCurrentProcess()->HasSwitch( -- switches::kHeadless)) { -+ if (command_line->HasSwitch(switches::kEnableLogging)) { + // Don't route to console for "handle" type in child processes. + if (command_line->GetSwitchValueASCII(switches::kEnableLogging) != + "handle") { + base::RouteStdioToConsole(/*create_console_if_not_found*/ true); + } -+ } else if (command_line->HasSwitch(switches::kHeadless)) { - // When running in headless mode we want stdio routed however if - // console does not exist we should not create one. - base::RouteStdioToConsole(/*create_console_if_not_found*/ false); } #endif @@ -91,7 +89,7 @@ index ffbb5986ca997..3c24cb27d3c12 100644 base::trace_event::TraceConfig trace_config = tracing::GetConfigForTraceToConsole(); base::trace_event::TraceLog::GetInstance()->SetEnabled( -@@ -330,12 +318,46 @@ RunContentProcess(ContentMainParams params, +@@ -329,12 +317,46 @@ RunContentProcess(ContentMainParams params, if (IsSubprocess()) CommonSubprocessInit(); diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 2c5cf4eb5..79e2fd2d0 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -364,7 +364,7 @@ index e5b246b988c50..117af4ea74b16 100644 // Calculate initial bounds. diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index f63948de2c5bf..c445451bf3d98 100644 +index 3ff20acdff374..b4f7a9bd539c1 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -20,6 +20,7 @@ @@ -375,7 +375,7 @@ index f63948de2c5bf..c445451bf3d98 100644 #include "ui/aura/window_event_dispatcher.h" #include "ui/base/class_property.h" #include "ui/base/cursor/cursor.h" -@@ -178,22 +179,42 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) { +@@ -183,22 +184,42 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) { native_widget_delegate_.get()); HWND parent_hwnd = nullptr; @@ -422,7 +422,7 @@ index f63948de2c5bf..c445451bf3d98 100644 // Stack immediately above its parent so that it does not cover other // root-level windows, with the exception of menus, to allow them to be // displayed on top of other windows. -@@ -1016,10 +1037,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) { +@@ -1021,10 +1042,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) { if (!native_widget_delegate_->IsNativeWidgetInitialized()) return; @@ -448,7 +448,7 @@ index f63948de2c5bf..c445451bf3d98 100644 } void DesktopWindowTreeHostWin::HandleClientSizeChanged( -@@ -1036,11 +1070,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() { +@@ -1041,11 +1075,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() { } void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) { @@ -466,7 +466,7 @@ index f63948de2c5bf..c445451bf3d98 100644 } bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { -@@ -1048,6 +1086,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { +@@ -1053,6 +1091,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { if (ui::PlatformEventSource::ShouldIgnoreNativePlatformEvents()) return true; @@ -479,7 +479,7 @@ index f63948de2c5bf..c445451bf3d98 100644 SendEventToSink(event); return event->handled(); } -@@ -1226,8 +1270,16 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) { +@@ -1231,8 +1275,16 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) { // positions in variable-DPI situations. See https://crbug.com/1224715 for // details. aura::Window* root = nullptr;