mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 114.0.5684.0 (main) (#37701)

Browse source 
* chore: bump chromium in DEPS to 113.0.5672.0

* chore: bump chromium in DEPS to 114.0.5673.0

* chore: bump chromium in DEPS to 114.0.5675.0

* chore: update patches

* 4223697: [json-schema-compiler] T::Populate with base::Value::Dict

4223697

* chore: update filenames.libcxx.gni

* 4290476: Report an explicit pause reason when stopping after taking a step.

4290476

* chore: bump chromium in DEPS to 114.0.5682.0

* 4373699: [SystemProfileSelectionDefaultNone] Enable feature by default

4373699

* chore: update patches

* Revert AsyncCompileJSToWasmWrapperJob simplification

4347597/11

* 4365718: Reland "Reland "Reland "[Tracing] Use Perfetto client library for tracing on Linux"""

4365718

* chore: bump chromium in DEPS to 114.0.5684.0

* chore: update patches

* 4335544: [handles] Refactor classes for abstract handles

4335544

* update patch description to include tracking issue

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot] 2023-03-30 22:03:58 -04:00 • committed by GitHub
parent 75919e28b8
commit 3fa03977c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 799 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

1
patches/node/.patches
View file

@ -36,3 +36,4 @@ allow_embedder_to_control_codegenerationfromstringscallback.patch
src_allow_optional_isolation_termination_in_node.patch
test_mark_cpu_prof_tests_as_flaky_in_electron.patch
lib_fix_broadcastchannel_initialization_location.patch
fix_adapt_debugger_tests_for_upstream_v8_changes.patch

12
patches/node/build_add_gn_build_files.patch
View file

@ -1220,10 +1220,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
+}
diff --git a/filenames.json b/filenames.json
new file mode 100644
index 0000000000000000000000000000000000000000..db004ae1e40de186f1e90df8dc79a26776a8148d
index 0000000000000000000000000000000000000000..3a600cbf16506cbf94919139b266b72d31e054c4
--- /dev/null
+++ b/filenames.json
@@ -0,0 +1,657 @@
@@ -0,0 +1,658 @@
+// This file is automatically generated by generate_gn_filenames_json.py
+// DO NOT EDIT
+{
@ -1260,6 +1260,7 @@ index 0000000000000000000000000000000000000000..db004ae1e40de186f1e90df8dc79a267
+ "//v8/include/v8-forward.h",
+ "//v8/include/v8-function-callback.h",
+ "//v8/include/v8-function.h",
+ "//v8/include/v8-handle-base.h",
+ "//v8/include/v8-initialization.h",
+ "//v8/include/v8-inspector-protocol.h",
+ "//v8/include/v8-inspector.h",
@ -2255,10 +2256,10 @@ index 0000000000000000000000000000000000000000..2a92eccfa582df361f2a889c0d9b32c1
+
+ out_file.writelines(new_contents)
diff --git a/tools/install.py b/tools/install.py
index 9d5f4a48bca2c926b3ffb3c51c070222d4f7ce7b..728b8596b348b827dbc279498123053aea446ff3 100755
index 9d5f4a48bca2c926b3ffb3c51c070222d4f7ce7b..411bd956ce0d3ff47ba1c48ae932e2d21b78047a 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -202,60 +202,72 @@ def files(action):
@@ -202,60 +202,73 @@ def files(action):
def headers(action):
def wanted_v8_headers(files_arg, dest):
v8_headers = [
@ -2336,6 +2337,7 @@ index 9d5f4a48bca2c926b3ffb3c51c070222d4f7ce7b..728b8596b348b827dbc279498123053a
+ '../../v8/include/v8-forward.h',
+ '../../v8/include/v8-function-callback.h',
+ '../../v8/include/v8-function.h',
+ '../../v8/include/v8-handle-base.h',
+ '../../v8/include/v8-initialization.h',
+ '../../v8/include/v8-inspector-protocol.h',
+ '../../v8/include/v8-inspector.h',
@ -2384,7 +2386,7 @@ index 9d5f4a48bca2c926b3ffb3c51c070222d4f7ce7b..728b8596b348b827dbc279498123053a
files_arg = [name for name in files_arg if name in v8_headers]
action(files_arg, dest)
@@ -282,7 +294,7 @@ def headers(action):
@@ -282,7 +295,7 @@ def headers(action):
if sys.platform.startswith('aix'):
action(['out/Release/node.exp'], 'include/node/')

82
patches/node/fix_adapt_debugger_tests_for_upstream_v8_changes.patch Normal file
View file

@ -0,0 +1,82 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 29 Mar 2023 09:55:47 +0200
Subject: fix: adapt debugger tests for upstream v8 changes
Updates debugger tests to conform to changes in https://chromium-review.googlesource.com/c/v8/v8/+/4290476
This can be removed when Node.js updates to at least V8 11.4.
diff --git a/test/common/debugger.js b/test/common/debugger.js
index 4aff5b9a0f74d99f8f605b68631f820e282091ab..d5d77fc7c648ddb45225f04c6cf23f9816b2186d 100644
--- a/test/common/debugger.js
+++ b/test/common/debugger.js
@@ -4,7 +4,7 @@ const spawn = require('child_process').spawn;
const BREAK_MESSAGE = new RegExp('(?:' + [
'assert', 'break', 'break on start', 'debugCommand',
- 'exception', 'other', 'promiseRejection',
+ 'exception', 'other', 'promiseRejection', 'step',
].join('|') + ') in', 'i');
let TIMEOUT = common.platformTimeout(5000);
@@ -121,13 +121,13 @@ function startCLI(args, flags = [], spawnOpts = {}) {
get breakInfo() {
const output = this.output;
const breakMatch =
- output.match(/break (?:on start )?in ([^\n]+):(\d+)\n/i);
+ output.match(/(step |break (?:on start )?)in ([^\n]+):(\d+)\n/i);
if (breakMatch === null) {
throw new Error(
`Could not find breakpoint info in ${JSON.stringify(output)}`);
}
- return { filename: breakMatch[1], line: +breakMatch[2] };
+ return { filename: breakMatch[2], line: +breakMatch[3] };
},
ctrlC() {
diff --git a/test/sequential/test-debugger-break.js b/test/sequential/test-debugger-break.js
index 1d92331d4e10136ddc9d811c3eb07e6b24d0fc51..8f37b71571225eb6b264cd44fa031f82c701cdbc 100644
--- a/test/sequential/test-debugger-break.js
+++ b/test/sequential/test-debugger-break.js
@@ -27,7 +27,7 @@ const cli = startCLI([script]);
await cli.stepCommand('n');
assert.ok(
- cli.output.includes(`break in ${script}:2`),
+ cli.output.includes(`step in ${script}:2`),
'pauses in next line of the script');
assert.match(
cli.output,
@@ -36,7 +36,7 @@ const cli = startCLI([script]);
await cli.stepCommand('next');
assert.ok(
- cli.output.includes(`break in ${script}:3`),
+ cli.output.includes(`step in ${script}:3`),
'pauses in next line of the script');
assert.match(
cli.output,
@@ -89,7 +89,7 @@ const cli = startCLI([script]);
await cli.stepCommand('');
assert.match(
cli.output,
- /break in node:timers/,
+ /step in node:timers/,
'entered timers.js');
await cli.stepCommand('cont');
diff --git a/test/sequential/test-debugger-run-after-quit-restart.js b/test/sequential/test-debugger-run-after-quit-restart.js
index a9da07dcdff8bd0b8cc69ccff8f29a67ff553592..2da4cea6359c8564a93863e43fc4a3f14a27e693 100644
--- a/test/sequential/test-debugger-run-after-quit-restart.js
+++ b/test/sequential/test-debugger-run-after-quit-restart.js
@@ -25,7 +25,7 @@ const path = require('path');
.then(() => cli.stepCommand('n'))
.then(() => {
assert.ok(
- cli.output.includes(`break in ${script}:2`),
+ cli.output.includes(`step in ${script}:2`),
'steps to the 2nd line'
);
})