chore: bump chromium to 124.0.6367.118 (30-x-y) (#42015)
* 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 4dff815f479880537c66f29a7571091ebfc417a1) * 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>
This commit is contained in:
parent
aa25b3a76e
commit
ddcb2b7183
8 changed files with 142 additions and 911 deletions
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'124.0.6367.91',
|
'124.0.6367.118',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v20.11.1',
|
'v20.11.1',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -9,7 +9,7 @@ potentially prevent a window from being created.
|
||||||
TODO(loc): this patch is currently broken.
|
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
|
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
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/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(
|
@@ -8391,6 +8391,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||||
|
|
|
@ -6,7 +6,7 @@ Subject: render_widget_host_view_base.patch
|
||||||
... something to do with OSR? and maybe <webview> as well? terrifying.
|
... 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
|
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
|
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
||||||
+++ b/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(
|
@@ -724,6 +724,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableForIOv2For(
|
||||||
|
|
|
@ -15,7 +15,7 @@ Note that we also need to manually update embedder's
|
||||||
`api::WebContents::IsFullscreenForTabOrPending` value.
|
`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
|
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
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/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(
|
@@ -7550,6 +7550,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||||
|
|
|
@ -6596,6 +6596,7 @@ describe('BrowserWindow module', () => {
|
||||||
afterEach(closeAllWindows);
|
afterEach(closeAllWindows);
|
||||||
|
|
||||||
ifit(hasCapturableScreen())('should allow the window to be dragged when enabled', async () => {
|
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
|
// WOA fails to load libnut so we're using require to defer loading only
|
||||||
// on supported platforms.
|
// on supported platforms.
|
||||||
// "@nut-tree\libnut-win32\build\Release\libnut.node is not a valid Win32 application."
|
// "@nut-tree\libnut-win32\build\Release\libnut.node is not a valid Win32 application."
|
||||||
|
@ -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 () => {
|
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
|
// @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');
|
const { mouse, straightTo, centerOf, Region, Button } = require('@nut-tree/nut-js') as typeof import('@nut-tree/nut-js');
|
||||||
|
|
||||||
|
|
|
@ -7,5 +7,7 @@
|
||||||
"session module ses.cookies should set cookie for standard scheme",
|
"session module ses.cookies should set cookie for standard scheme",
|
||||||
"webFrameMain module WebFrame.visibilityState should match window state",
|
"webFrameMain module WebFrame.visibilityState should match window state",
|
||||||
"reporting api sends a report for a deprecation",
|
"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"
|
||||||
]
|
]
|
|
@ -38,9 +38,6 @@
|
||||||
"ws": "^7.4.6",
|
"ws": "^7.4.6",
|
||||||
"yargs": "^16.0.3"
|
"yargs": "^16.0.3"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
|
||||||
"@nut-tree/nut-js": "^3.1.2"
|
|
||||||
},
|
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"nan": "file:../../third_party/nan",
|
"nan": "file:../../third_party/nan",
|
||||||
"dbus-native/optimist/minimist": "1.2.7",
|
"dbus-native/optimist/minimist": "1.2.7",
|
||||||
|
|
1034
spec/yarn.lock
1034
spec/yarn.lock
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue