Skip to content

Commit

Permalink
chore: bump chromium to 124.0.6367.118 (30-x-y) (#42015)
Browse files Browse the repository at this point in the history
* chore: bump chromium in DEPS to 124.0.6367.118

* chore: update patches

* chore: disable tests that require nut.js (#42006)

* chore: disable tests that require nut.js

* fixup! chore: disable tests that require nut.js

(cherry picked from commit 4dff815)

* test: revert inadvertent winreg change

winreg 1.2.5 breaks the following tests:
app module setAsDefaultProtocolClient(protocol, path, args) creates a registry entry for the protocol class
app module setAsDefaultProtocolClient(protocol, path, args) only unsets a class registry key if it contains other data

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
  • Loading branch information
4 people committed May 2, 2024
1 parent aa25b3a commit ddcb2b7
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 911 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

vars = {
'chromium_version':
'124.0.6367.91',
'124.0.6367.118',
'node_version':
'v20.11.1',
'nan_version':
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/can_create_window.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index d77fae25126fd4edcd62651610f704612f451092..5596f18e623a88e41f3fd97d0abe5f831c5f1452 100644
index 2c985367d1c6268994b9973d3db2e065a80922eb..812708f24cf9e389d5f0a813c406fec082a795b4 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -8391,6 +8391,7 @@ void RenderFrameHostImpl::CreateNewWindow(
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/render_widget_host_view_base.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: render_widget_host_view_base.patch
... something to do with OSR? and maybe <webview> as well? terrifying.

diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index 6b6902c0cb0eee071741421fdfd616d6bacea619..ad27029859895a1b3434913c6f4d38e9dfd69bea 100644
index f67fa6e039aed0321fab980eb39c7f9981be8366..390a8b4870326083d33a37c8f6cd3e13ff57b4ed 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -724,6 +724,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableForIOv2For(
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/webview_fullscreen.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.

diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 5596f18e623a88e41f3fd97d0abe5f831c5f1452..e7ff43e3aa50add7050e97fdeee269819f87da39 100644
index 812708f24cf9e389d5f0a813c406fec082a795b4..22789f1f1ebbbf76575c3d07e1c9381af73a590a 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7550,6 +7550,17 @@ void RenderFrameHostImpl::EnterFullscreen(
Expand Down
2 changes: 2 additions & 0 deletions spec/api-browser-window-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6596,6 +6596,7 @@ describe('BrowserWindow module', () => {
afterEach(closeAllWindows);

ifit(hasCapturableScreen())('should allow the window to be dragged when enabled', async () => {
// FIXME: nut-js has been removed from npm; we need to find a replacement
// WOA fails to load libnut so we're using require to defer loading only
// on supported platforms.
// "@nut-tree\libnut-win32\build\Release\libnut.node is not a valid Win32 application."
Expand Down Expand Up @@ -6640,6 +6641,7 @@ describe('BrowserWindow module', () => {
});

ifit(hasCapturableScreen())('should allow the window to be dragged when no WCO and --webkit-app-region: drag enabled', async () => {
// FIXME: nut-js has been removed from npm; we need to find a replacement
// @ts-ignore: nut-js is an optional dependency so it may not be installed
const { mouse, straightTo, centerOf, Region, Button } = require('@nut-tree/nut-js') as typeof import('@nut-tree/nut-js');

Expand Down
6 changes: 4 additions & 2 deletions spec/disabled-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@
"session module ses.cookies should set cookie for standard scheme",
"webFrameMain module WebFrame.visibilityState should match window state",
"reporting api sends a report for a deprecation",
"chromium features SpeechSynthesis should emit lifecycle events"
]
"chromium features SpeechSynthesis should emit lifecycle events",
"BrowserWindow module draggable regions should allow the window to be dragged when enabled",
"BrowserWindow module draggable regions should allow the window to be dragged when no WCO and --webkit-app-region: drag enabled"
]
3 changes: 0 additions & 3 deletions spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
"ws": "^7.4.6",
"yargs": "^16.0.3"
},
"optionalDependencies": {
"@nut-tree/nut-js": "^3.1.2"
},
"resolutions": {
"nan": "file:../../third_party/nan",
"dbus-native/optimist/minimist": "1.2.7",
Expand Down

0 comments on commit ddcb2b7

Please sign in to comment.