Skip to content

Commit eb7a5c2

Browse files
electron-roller[bot]codebytere
electron-roller[bot]
and
codebytere
authored
chore: bump node to v20.18.3 (34-x-y) (#45575)
* chore: bump node in DEPS to v20.18.3 * src: fix outdated js2c.cc references nodejs/node#56133 * lib: remove startsWith/endsWith primordials for char checks nodejs/node#55407 * test,crypto: make crypto tests work with BoringSSL nodejs/node#55491 * fix: potential WIN32_LEAN_AND_MEAN redefinition c-ares/c-ares#869 * chore: fixup patch indices * deps: update c-ares to v1.34.1 nodejs/node#55369 * chore: fix bssl test --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
1 parent cb1c7b4 commit eb7a5c2

33 files changed

Lines changed: 147 additions & 301 deletions

File tree

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'132.0.6834.207',
66
'node_version':
7-
'v20.18.2',
7+
'v20.18.3',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

‎patches/chromium/can_create_window.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ index f58b9b0333e01f95ecf1b1d3fd3e273b675705cc..dae7654fc44e25ddc80dab4732b617f0
2121
&no_javascript_access);
2222

2323
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
24-
index 03b5291540931c40707fbd786645721336c72dae..67c946a84a6578eaf73f33c2ff42a55876b08404 100644
24+
index 62420958702cebe16423f0ea42ca200f5a93d45a..d35ae086793a52ea38da97b9236e073b806a67a6 100644
2525
--- a/content/browser/web_contents/web_contents_impl.cc
2626
+++ b/content/browser/web_contents/web_contents_impl.cc
27-
@@ -4893,6 +4893,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
27+
@@ -4895,6 +4895,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2828
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
2929
opener);
3030

@@ -37,7 +37,7 @@ index 03b5291540931c40707fbd786645721336c72dae..67c946a84a6578eaf73f33c2ff42a558
3737
// If the new frame has a name, make sure any SiteInstances that can find
3838
// this named frame have proxies for it. Must be called after
3939
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
40-
@@ -4934,12 +4940,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
40+
@@ -4936,12 +4942,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
4141
AddWebContentsDestructionObserver(new_contents_impl);
4242
}
4343

‎patches/chromium/chore_partial_revert_of.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
1414
by changing something in Electron.
1515

1616
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
17-
index d1bfb30a063fb1be05cb7e3c888ed47d13935585..6c5a64fed98b7120ff2426066fbfadf5c2a6d9a0 100644
17+
index ce65cb2aec41faa58a1dfa43f5c1ac8e5bc66641..784a7536eec5a248e4725253c091b039047ff1ea 100644
1818
--- a/content/browser/web_contents/web_contents_impl.cc
1919
+++ b/content/browser/web_contents/web_contents_impl.cc
20-
@@ -4819,9 +4819,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
20+
@@ -4821,9 +4821,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2121
bool renderer_started_hidden =
2222
params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB;
2323

‎patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17
218218
content::WebContents* AddNewContents(
219219
content::WebContents* source,
220220
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
221-
index eecd6fee29f6fd45299e8f8790c65dc76b6cb93f..aed9541bc931ccbc1f8d80a6ce4dfe055db59da2 100644
221+
index d88c3b6a3625c2f4d0c67677777202f7db85ea88..71835a747d6732b963c5cdc289539665aa988c47 100644
222222
--- a/content/browser/web_contents/web_contents_impl.cc
223223
+++ b/content/browser/web_contents/web_contents_impl.cc
224-
@@ -4788,8 +4788,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
224+
@@ -4790,8 +4790,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
225225

226226
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
227227
source_site_instance, params.window_container_type,

‎patches/chromium/feat_add_signals_when_embedder_cleanup_callbacks_run_for.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Refs https://issues.chromium.org/issues/40210365 which is blocked
2525
on https://issues.chromium.org/issues/42203693
2626

2727
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
28-
index 2be37976a1305f1deed561b3b829dbb5d7ae85e7..44eb16f17d272125e2b4a590f8962eb8144d9755 100644
28+
index e5ee2c6b3cb787ff9f8272d4344a1e18c44971e2..22469cf0ab1025eefcf94e2cd351087e52182130 100644
2929
--- a/gin/isolate_holder.cc
3030
+++ b/gin/isolate_holder.cc
3131
@@ -34,6 +34,8 @@ v8::ArrayBuffer::Allocator* g_array_buffer_allocator = nullptr;
@@ -37,7 +37,7 @@ index 2be37976a1305f1deed561b3b829dbb5d7ae85e7..44eb16f17d272125e2b4a590f8962eb8
3737

3838
std::unique_ptr<v8::Isolate::CreateParams> getModifiedIsolateParams(
3939
std::unique_ptr<v8::Isolate::CreateParams> params,
40-
@@ -198,10 +200,26 @@ IsolateHolder::getDefaultIsolateParams() {
40+
@@ -194,10 +196,26 @@ IsolateHolder::getDefaultIsolateParams() {
4141
return params;
4242
}
4343

@@ -65,10 +65,10 @@ index 2be37976a1305f1deed561b3b829dbb5d7ae85e7..44eb16f17d272125e2b4a590f8962eb8
6565
+
6666
} // namespace gin
6767
diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
68-
index 52b8c1af58678b9fee684ff75340c98fcc73b552..f79407d741a30298d09efd53589f16dc9b26107f 100644
68+
index c22b0a7f9af621573e888a518ccdc22293ce07ef..d3e5ced425df54f42534cec5cc0c5bbfb9d79c6c 100644
6969
--- a/gin/public/isolate_holder.h
7070
+++ b/gin/public/isolate_holder.h
71-
@@ -131,6 +131,8 @@ class GIN_EXPORT IsolateHolder {
71+
@@ -130,6 +130,8 @@ class GIN_EXPORT IsolateHolder {
7272
// Should only be called after v8::IsolateHolder::Initialize() is invoked.
7373
static std::unique_ptr<v8::Isolate::CreateParams> getDefaultIsolateParams();
7474

@@ -77,7 +77,7 @@ index 52b8c1af58678b9fee684ff75340c98fcc73b552..f79407d741a30298d09efd53589f16dc
7777
v8::Isolate* isolate() { return isolate_; }
7878

7979
// This method returns if v8::Locker is needed to access isolate.
80-
@@ -144,6 +146,9 @@ class GIN_EXPORT IsolateHolder {
80+
@@ -143,6 +145,9 @@ class GIN_EXPORT IsolateHolder {
8181

8282
void EnableIdleTasks(std::unique_ptr<V8IdleTaskRunner> idle_task_runner);
8383

‎patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ index 51522e60d6dc14f1113cc438558b6b393c3fe73a..153ed02f493a83ef9ca354cc18736f93
8787
// The view with active text input state, i.e., a focused <input> element.
8888
// It will be nullptr if no such view exists. Note that the active view
8989
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
90-
index 53e3bc48242f07bd984308583b1f999360f4e9d2..d1bfb30a063fb1be05cb7e3c888ed47d13935585 100644
90+
index ec55a5a2807bb9fc328b33d18ee10444f4b98126..ce65cb2aec41faa58a1dfa43f5c1ac8e5bc66641 100644
9191
--- a/content/browser/web_contents/web_contents_impl.cc
9292
+++ b/content/browser/web_contents/web_contents_impl.cc
93-
@@ -9395,7 +9395,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
93+
@@ -9397,7 +9397,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
9494
"WebContentsImpl::OnFocusedElementChangedInFrame",
9595
"render_frame_host", frame);
9696
RenderWidgetHostViewBase* root_view =

‎patches/chromium/ignore_parse_errors_for_pkey_appusermodel_toastactivatorclsid.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Bug: N/A
1111
Change-Id: I9fc472212b2d3afac2c8e18a2159bc2d50bbdf98
1212

1313
diff --git a/AUTHORS b/AUTHORS
14-
index 6008db66fcb0686046a5ca40d04bb2534cb0b04a..d5079e68cef38168c4c66833a53121930fa59afd 100644
14+
index 897b6678b6d583f3361c41f62b960e46165d288d..13afc62098608e79faf02d504b54d9d6326b8ed3 100644
1515
--- a/AUTHORS
1616
+++ b/AUTHORS
17-
@@ -339,6 +339,7 @@ David Futcher <david.mike.futcher@gmail.com>
17+
@@ -336,6 +336,7 @@ David Futcher <david.mike.futcher@gmail.com>
1818
David Jin <davidjin@amazon.com>
1919
David Lechner <david@pybricks.com>
2020
David Leen <davileen@amazon.com>
@@ -23,10 +23,10 @@ index 6008db66fcb0686046a5ca40d04bb2534cb0b04a..d5079e68cef38168c4c66833a5312193
2323
David McAllister <mcdavid@amazon.com>
2424
David Michael Barr <david.barr@samsung.com>
2525
diff --git a/base/win/shortcut.cc b/base/win/shortcut.cc
26-
index 967e130e823f41c402411dfadb53b805e8a8c92b..3a9df7f31861ca69168fd24513ee554d0984798d 100644
26+
index 02f3e63d16c3324f546f6155d722900f0a81131a..1dfdb0c8dc5a7368382e73a0db1b4d135b4d2176 100644
2727
--- a/base/win/shortcut.cc
2828
+++ b/base/win/shortcut.cc
29-
@@ -356,8 +356,9 @@ bool ResolveShortcutProperties(const FilePath& shortcut_path,
29+
@@ -342,8 +342,9 @@ bool ResolveShortcutProperties(const FilePath& shortcut_path,
3030
*(pv_toast_activator_clsid.get().puuid));
3131
break;
3232
default:

‎patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ index 886d70636aedfa714b29625f58420ad11ede9ffd..7906b94983733a9deb2365fb2a134619
4444

4545
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
4646
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
47-
index 67c946a84a6578eaf73f33c2ff42a55876b08404..eecd6fee29f6fd45299e8f8790c65dc76b6cb93f 100644
47+
index d35ae086793a52ea38da97b9236e073b806a67a6..d88c3b6a3625c2f4d0c67677777202f7db85ea88 100644
4848
--- a/content/browser/web_contents/web_contents_impl.cc
4949
+++ b/content/browser/web_contents/web_contents_impl.cc
50-
@@ -5618,6 +5618,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
50+
@@ -5620,6 +5620,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
5151
return text_input_manager_.get();
5252
}
5353

‎patches/chromium/refactor_unfilter_unresponsive_events.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ This CL removes these filters so the unresponsive event can still be
1515
accessed from our JS event. The filtering is moved into Electron's code.
1616

1717
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
18-
index 6c5a64fed98b7120ff2426066fbfadf5c2a6d9a0..d7f7bfe232d6eeca8e75d6f3ce3fafbc7515727a 100644
18+
index 784a7536eec5a248e4725253c091b039047ff1ea..6939dbd68fbdde3710b13a4158893d859910034a 100644
1919
--- a/content/browser/web_contents/web_contents_impl.cc
2020
+++ b/content/browser/web_contents/web_contents_impl.cc
21-
@@ -9529,25 +9529,13 @@ void WebContentsImpl::RendererUnresponsive(
21+
@@ -9531,25 +9531,13 @@ void WebContentsImpl::RendererUnresponsive(
2222
base::RepeatingClosure hang_monitor_restarter) {
2323
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RendererUnresponsive",
2424
"render_widget_host", render_widget_host);

‎patches/chromium/web_contents.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ is needed for OSR.
99
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
1010

1111
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
12-
index aed9541bc931ccbc1f8d80a6ce4dfe055db59da2..c4185b6238acefefc89b421a6e7fd0744f07ca17 100644
12+
index 71835a747d6732b963c5cdc289539665aa988c47..e290f4fc3a85f55137d055958ca9bef4987fa3a7 100644
1313
--- a/content/browser/web_contents/web_contents_impl.cc
1414
+++ b/content/browser/web_contents/web_contents_impl.cc
15-
@@ -3758,6 +3758,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
15+
@@ -3760,6 +3760,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
1616
params.main_frame_name, GetOpener(), primary_main_frame_policy,
1717
base::UnguessableToken::Create());
1818

@@ -26,7 +26,7 @@ index aed9541bc931ccbc1f8d80a6ce4dfe055db59da2..c4185b6238acefefc89b421a6e7fd074
2626
std::unique_ptr<WebContentsViewDelegate> delegate =
2727
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
2828

29-
@@ -3768,6 +3775,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
29+
@@ -3770,6 +3777,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
3030
view_ = CreateWebContentsView(this, std::move(delegate),
3131
&render_view_host_delegate_view_);
3232
}

0 commit comments

Comments
 (0)