Browse Source

chore: bump chromium to 124.0.6367.29 (30-x-y) (#41768)

* chore: bump chromium in DEPS to 124.0.6367.29

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <[email protected]>
electron-roller[bot] 1 year ago
parent
commit
c9b2de9a36

+ 1 - 1
DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '124.0.6367.18',
+    '124.0.6367.29',
   'node_version':
     'v20.11.1',
   'nan_version':

+ 4 - 4
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -46,10 +46,10 @@ index e382658efba86d3c317699e4e5d5496409b09706..67ee9a405eb6c68d5e19d416f1b4bcad
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index f97a79be8f8197058325d62cd8e25ca6334b3e6c..f3f5db9441c2a10fc7246b1f5e33dac613ca17cb 100644
+index d851c15ee215a33a6212e241f28adfbd75ce31ae..02d3ace1b30f0bcee92d48652fcd7e7b7ab2a381 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7201,9 +7201,12 @@ test("unit_tests") {
+@@ -7202,9 +7202,12 @@ test("unit_tests") {
        "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
      ]
  
@@ -63,7 +63,7 @@ index f97a79be8f8197058325d62cd8e25ca6334b3e6c..f3f5db9441c2a10fc7246b1f5e33dac6
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -8184,6 +8187,10 @@ test("unit_tests") {
+@@ -8185,6 +8188,10 @@ test("unit_tests") {
        "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
      ]
  
@@ -74,7 +74,7 @@ index f97a79be8f8197058325d62cd8e25ca6334b3e6c..f3f5db9441c2a10fc7246b1f5e33dac6
      sources += [
        # The importer code is not used on Android.
        "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8253,7 +8260,6 @@ test("unit_tests") {
+@@ -8254,7 +8261,6 @@ test("unit_tests") {
      }
  
      deps += [

+ 2 - 2
patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch

@@ -7,10 +7,10 @@ With WCO, allow chromium to handle synthetic mouse events generated for touch
 actions in the non-client caption area.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index 8c009b8e50049d49e47802395d1499b49475ee7a..618db09558e9bebd844fef465ab7298651c15abf 100644
+index 90c37ebd4549c825bc0f03945d88828dbadf1559..c3ab16a0923f38080ef753f137a315151194ba30 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -1215,6 +1215,10 @@ void DesktopWindowTreeHostWin::HandleHeadlessWindowBoundsChanged(
+@@ -1220,6 +1220,10 @@ void DesktopWindowTreeHostWin::HandleHeadlessWindowBoundsChanged(
    window()->SetProperty(aura::client::kHeadlessBoundsKey, bounds);
  }
  

+ 2 - 2
patches/chromium/enable_reset_aspect_ratio.patch

@@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
 Make SetAspectRatio accept 0 as valid input, which would reset to null.
 
 diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-index f63948de2c5bfa589ea3ada817bb0820697e4bb2..8c009b8e50049d49e47802395d1499b49475ee7a 100644
+index 3ff20acdff374d183a3c5b862767e64671443a6a..90c37ebd4549c825bc0f03945d88828dbadf1559 100644
 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
 +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
-@@ -572,7 +572,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
+@@ -577,7 +577,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
  void DesktopWindowTreeHostWin::SetAspectRatio(
      const gfx::SizeF& aspect_ratio,
      const gfx::Size& excluded_margin) {

+ 8 - 8
patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch

@@ -9,21 +9,21 @@ be created for each child process, despite logs being redirected to a
 file.
 
 diff --git a/content/app/content_main.cc b/content/app/content_main.cc
-index ffbb5986ca997135bd44b5a4aa02066cfce5f394..520825bc2d7d7006544e9d88a8c196f03903ff60 100644
+index fe6ffe9a1b9b39e077e6bdb60e4802e040a2f078..9c25426fa65ecf0b931972cf814329a0a416324c 100644
 --- a/content/app/content_main.cc
 +++ b/content/app/content_main.cc
-@@ -308,14 +308,13 @@ RunContentProcess(ContentMainParams params,
+@@ -307,14 +307,13 @@ 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::RouteStdioToConsole(/*create_console_if_not_found*/ true);
--    } else if (base::CommandLine::ForCurrentProcess()->HasSwitch(
--                   switches::kHeadless)) {
+-    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);
 +    auto const* cmd_line = base::CommandLine::ForCurrentProcess();
 +    bool const log_to_stderr =
 +        cmd_line->HasSwitch(switches::kEnableLogging) &&