chore: bump chromium to 5b340c815ce15ab2efcf277ed19e9 (master) (#22064)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: loc <andy@slack-corp.com>
Co-authored-by: Robo <hop2deep@gmail.com>
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
This commit is contained in:
Electron Bot 2020-03-03 13:35:05 -08:00 committed by GitHub
parent 3a331ffca6
commit 39baf68790
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
126 changed files with 1047 additions and 961 deletions

View file

@ -39,3 +39,6 @@ fix_include_io_h_in_uvwasi_for_win.patch
fix_--perf-prof_only_works_on_linux.patch
fix_we_need_to_eager-load_cjs_modules.patch
fix_don_t_preparemainexecution_twice.patch
avoid_calling_deprecated_method.patch
remove_deprecated_wasm_module_type_check.patch
weakrefs_rename_finalizationgroup_to_finalizationregistry_for_js.patch

View file

@ -7,7 +7,7 @@ TypedArray max length for 64 bit has been changed to 2**32-1 elements
See: https://source.chromium.org/chromium/_/chromium/v8/v8.git/+/3bff8fa5ea29c0623c0a5601b6fa67c64cbcc319
diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js
index de3e7fa52390f0631b93fb4adf2e8a4e31bdc572..eae7533250599cfc649a17c19c8b0fa268155b69 100644
index 75bcb03d1913c4d0c5825fbc2931aa6e84f922ed..9b7a64607edfc227e0473ae11075ca9b83419739 100644
--- a/test/parallel/test-buffer-alloc.js
+++ b/test/parallel/test-buffer-alloc.js
@@ -8,8 +8,8 @@ const SlowBuffer = require('buffer').SlowBuffer;

View file

@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Thu, 13 Feb 2020 10:34:31 -0800
Subject: Avoid calling deprecated method
The {SetExpectInlineWasm} method is deprecated and non-functional since
V8 v8.1.
Thus node should stop calling it, so that it can be fully removed in a
future v8 version.
diff --git a/src/node_serdes.cc b/src/node_serdes.cc
index a2d185c4167a75e227cd4b2abbf5c5abc7e16acb..e918ed9d12e9fb1d13b2fc05a98cab099fb71a68 100644
--- a/src/node_serdes.cc
+++ b/src/node_serdes.cc
@@ -286,7 +286,6 @@ DeserializerContext::DeserializerContext(Environment* env,
length_(Buffer::Length(buffer)),
deserializer_(env->isolate(), data_, length_, this) {
object()->Set(env->context(), env->buffer_string(), buffer).Check();
- deserializer_.SetExpectInlineWasm(true);
MakeWeak();
}

View file

@ -812,7 +812,7 @@ index 0000000000000000000000000000000000000000..510d86194ed71d78b2c89c7a77422afc
+}
diff --git a/deps/uvwasi/BUILD.gn b/deps/uvwasi/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..52d0c08bd9818b9436175ea8157e462e4d0fbafe
index 0000000000000000000000000000000000000000..e9beace20f25e270dd80509bd6d5871b140d5b79
--- /dev/null
+++ b/deps/uvwasi/BUILD.gn
@@ -0,0 +1,34 @@
@ -916,7 +916,7 @@ index 0000000000000000000000000000000000000000..f13b471d17128468bed06e66bd03a2ea
+}
diff --git a/filenames.json b/filenames.json
new file mode 100644
index 0000000000000000000000000000000000000000..aa9aa6d32f7d33a6f82ccb32a52f53ed3d5a77f0
index 0000000000000000000000000000000000000000..d325cdc5ca7a323834c6962fa43d2c9ff38a5728
--- /dev/null
+++ b/filenames.json
@@ -0,0 +1,460 @@
@ -1586,7 +1586,7 @@ index 0000000000000000000000000000000000000000..f3c5c798c0aefcb8cf9b1570a7b4817c
+ args = rebase_path(inputs + outputs, root_build_dir)
+}
diff --git a/src/node_version.h b/src/node_version.h
index e5205bb303fab8e53b56db68543a47c47280e3d4..53b97162319a0cc300b2d8950ffb414db6bf52e8 100644
index 88831ab19d72014f3e92c80516dc6c9d76e16158..01377c95b74879e74ca476eda6899e69597b9d89 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -89,7 +89,10 @@

View file

@ -10,7 +10,7 @@ THe fix for this should land in node-gyp as discussed in above issue,
landing this as temporary patch.
diff --git a/common.gypi b/common.gypi
index f07e65f719a1a5939997dfcae7bc787ee6391f4d..f4d03a2fdfd47a4e6a71c7146d92ce7cbc44993d 100644
index 0000f6eaea5cbfb793750c0592c1bb912cbe0a14..6ed509d81d14211f608495263f11a1d2cbc5013c 100644
--- a/common.gypi
+++ b/common.gypi
@@ -19,7 +19,7 @@

View file

@ -14,7 +14,7 @@ renderer/browser/worker/sandboxed bootstrap scripts). These are loaded
through LoadEmbedderJavaScriptSource()
diff --git a/src/node_native_module.cc b/src/node_native_module.cc
index 814adb620dcf8a459bbede11714e9ccd7f4e0b3e..04a706d15f2ab682f8d4ae972abee8986494f7a7 100644
index 43c13ea30a0dc56151cba3d4597ae81b27c41300..e9a43592d558409d5fd43e2f51b22efb4e41551d 100644
--- a/src/node_native_module.cc
+++ b/src/node_native_module.cc
@@ -23,6 +23,7 @@ NativeModuleLoader NativeModuleLoader::instance_;
@ -38,10 +38,10 @@ index fabaea75686161f488a03349e07049a513b98fad..5a6b01dc12fb77d5f8c26a1153ead2a1
bool Exists(const char* id);
diff --git a/tools/js2c.py b/tools/js2c.py
index 752344d68c3f63b4c5e491b33d4576ed48f8b74f..a6f0805048e3c3f4dd81ce6e90b684c48e52b67c 100755
index 9e9883129bed62c591d23f71d139514c5034ac8d..dd7a49c2a13e58be8af343bdded6d885c5598e03 100755
--- a/tools/js2c.py
+++ b/tools/js2c.py
@@ -187,13 +187,15 @@ namespace native_module {{
@@ -56,13 +56,15 @@ namespace native_module {{
{0}
@ -59,16 +59,7 @@ index 752344d68c3f63b4c5e491b33d4576ed48f8b74f..a6f0805048e3c3f4dd81ce6e90b684c4
}} // namespace native_module
@@ -256,7 +258,7 @@ def AddModule(filename, definitions, initializers):
initializers.append(initializer)
def NormalizeFileName(filename):
- split = filename.split(os.path.sep)
+ split = os.path.normpath(filename).split(os.path.sep)
if split[0] == 'deps':
split = ['internal'] + split
else: # `lib/**/*.js` so drop the 'lib' part
@@ -114,8 +114,8 @@ def GetDefinition(var, source, step=30):
@@ -112,8 +114,8 @@ def GetDefinition(var, source, step=30):
return definition, len(code_points)
@ -79,7 +70,16 @@ index 752344d68c3f63b4c5e491b33d4576ed48f8b74f..a6f0805048e3c3f4dd81ce6e90b684c4
name = NormalizeFileName(filename)
slug = SLUGGER_RE.sub('_', name)
var = slug + '_raw'
@@ -141,7 +141,7 @@ def NormalizeFileName(filename):
@@ -123,7 +125,7 @@ def AddModule(filename, definitions, initializers):
initializers.append(initializer)
def NormalizeFileName(filename):
- split = filename.split(os.path.sep)
+ split = os.path.normpath(filename).split(os.path.sep)
if split[0] == 'deps':
split = ['internal'] + split
else: # `lib/**/*.js` so drop the 'lib' part
@@ -141,7 +143,7 @@ def NormalizeFileName(filename):
return os.path.splitext(filename)[0]
@ -88,7 +88,7 @@ index 752344d68c3f63b4c5e491b33d4576ed48f8b74f..a6f0805048e3c3f4dd81ce6e90b684c4
# Build source code lines
definitions = []
initializers = []
@@ -149,13 +149,26 @@ def JS2C(source_files, target):
@@ -149,13 +151,26 @@ def JS2C(source_files, target):
for filename in source_files['.js']:
AddModule(filename, definitions, initializers)
@ -118,7 +118,7 @@ index 752344d68c3f63b4c5e491b33d4576ed48f8b74f..a6f0805048e3c3f4dd81ce6e90b684c4
write_if_chaged(out, target)
@@ -344,17 +358,21 @@ def main():
@@ -208,17 +223,21 @@ def main():
)
parser.add_argument('--target', help='output file')
parser.add_argument('--verbose', action='store_true', help='output file')

View file

@ -8,10 +8,10 @@ once we stop warning and begin to unilaterally prevent non-context aware modules
from being loaded.
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
index c86b5851ca9332ca440443e5feab2e65c7ac30b9..9416cf377871c217413bd9bcc27a7b35c9de1ca2 100644
index cef4e5086ca8160a7d715915f735963e369068b1..35ad9ee1a685177894bb5c13c58c16af2ccee362 100644
--- a/lib/internal/bootstrap/pre_execution.js
+++ b/lib/internal/bootstrap/pre_execution.js
@@ -80,8 +80,10 @@ function patchProcessObject(expandArgv1) {
@@ -86,8 +86,10 @@ function patchProcessObject(expandArgv1) {
if (expandArgv1 && process.argv[1] && !process.argv[1].startsWith('-')) {
// Expand process.argv[1] into a full path.
@ -23,10 +23,10 @@ index c86b5851ca9332ca440443e5feab2e65c7ac30b9..9416cf377871c217413bd9bcc27a7b35
// TODO(joyeecheung): most of these should be deprecated and removed,
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 38f4d277a51e3c3ff6d1fe37128e975b888207f0..b21a3e12e7b9dd49e0ffb7ef6495443ecb1d156f 100644
index 22912e7c89b4cba78315269c3e009bfca1ccec27..8d6fc381330867f40740c1e2e327a05cc4045785 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -1128,6 +1128,13 @@ Module.prototype._compile = function(content, filename) {
@@ -1129,6 +1129,13 @@ Module.prototype._compile = function(content, filename) {
if (getOptionValue('--inspect-brk') && process._eval == null) {
if (!resolvedArgv) {
// We enter the repl if we're not given a filename argument.
@ -41,10 +41,10 @@ index 38f4d277a51e3c3ff6d1fe37128e975b888207f0..b21a3e12e7b9dd49e0ffb7ef6495443e
try {
resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
diff --git a/src/env.h b/src/env.h
index 60cb1b6d113e7e0687d96806f8940b5a715144cf..eef7b7bc244b4231419b4ec3013fa1cf700c97ef 100644
index 4e625f34741c0cf1cd175baf0189406140124ceb..aa40bdc3ccd963b8b6f48d52378801f88f87b733 100644
--- a/src/env.h
+++ b/src/env.h
@@ -914,6 +914,15 @@ class Environment : public MemoryRetainer {
@@ -911,6 +911,15 @@ class Environment : public MemoryRetainer {
uint64_t thread_id = kNoThreadId);
~Environment();
@ -60,7 +60,7 @@ index 60cb1b6d113e7e0687d96806f8940b5a715144cf..eef7b7bc244b4231419b4ec3013fa1cf
void InitializeLibuv(bool start_profiler_idle_notifier);
inline const std::vector<std::string>& exec_argv();
inline const std::vector<std::string>& argv();
@@ -1268,6 +1277,9 @@ class Environment : public MemoryRetainer {
@@ -1280,6 +1289,9 @@ class Environment : public MemoryRetainer {
inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>),
const char* errmsg);
@ -71,7 +71,7 @@ index 60cb1b6d113e7e0687d96806f8940b5a715144cf..eef7b7bc244b4231419b4ec3013fa1cf
v8::Isolate* const isolate_;
IsolateData* const isolate_data_;
diff --git a/src/node_binding.cc b/src/node_binding.cc
index 4adb4b893925b1b0ebf6ba41040121438db56d1f..da60922c9e351bf24e11ae2dedae56c316455885 100644
index db60617cebee83ac09371aa1e2200280e29bd772..714f973a7e984fef2e705882a3f30d8a95c33653 100644
--- a/src/node_binding.cc
+++ b/src/node_binding.cc
@@ -3,6 +3,7 @@
@ -82,7 +82,7 @@ index 4adb4b893925b1b0ebf6ba41040121438db56d1f..da60922c9e351bf24e11ae2dedae56c3
#include "util.h"
#if HAVE_OPENSSL
@@ -466,10 +467,22 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
@@ -467,10 +468,22 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
if (mp != nullptr) {
if (mp->nm_context_register_func == nullptr) {

View file

@ -7,10 +7,10 @@ This is used so that we can modify the flag at runtime where
config can only be set at compile time.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 0f36697ce5ed0b5bb6df74ceca219574da7eea53..a7fc05a247bfcd2b6da048c9def3b78025bd43fe 100644
index 36d06759aac57b1aa813b52c94e2168b8a8f9087..fd97a471aecc5182dfc3790286a3e01f02117937 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -167,7 +167,7 @@ const {
@@ -118,7 +118,7 @@ const {
queueMicrotask
} = require('internal/process/task_queues');

View file

@ -8,7 +8,7 @@ node modules will have different (wrong) ideas about how v8 structs are laid
out in memory on 64-bit machines, and will summarily fail to work.
diff --git a/common.gypi b/common.gypi
index f4d03a2fdfd47a4e6a71c7146d92ce7cbc44993d..d88db157c0e2972c5a7c4f8dacb5a69bff1d9b72 100644
index 6ed509d81d14211f608495263f11a1d2cbc5013c..26a3b48dbfb4b066d86e4eaa73d870a442ccbdaa 100644
--- a/common.gypi
+++ b/common.gypi
@@ -75,6 +75,9 @@

View file

@ -4,7 +4,7 @@ Date: Mon, 6 Mar 2017 10:42:34 -0300
Subject: Expose `get_linked_module` function
This is a requirement for electron/electron#8815, which exposes some linked
modules to sandboxed renderers.
modules to sandboxed renderers.
TODO(codebytere): remove and replace with a public facing API.

View file

@ -24,10 +24,10 @@ Environment on the V8 context of blink, so no new V8 context is created.
As a result, a renderer process may have multiple Node Environments in it.
diff --git a/src/env.cc b/src/env.cc
index 90d10590e5dcc4c6cd6253403f8ae34bd02e7212..948a29c5c245ed7e646378bd9b8ea1f213848455 100644
index 3dbc56b7c56bee90b76ade6af610105d1e0e916e..2678de6f7dcab8efb1ea506ae9861e07df5544f1 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -382,6 +382,12 @@ Environment::Environment(IsolateData* isolate_data,
@@ -385,6 +385,12 @@ Environment::Environment(IsolateData* isolate_data,
// TODO(joyeecheung): deserialize when the snapshot covers the environment
// properties.
CreateProperties();
@ -41,7 +41,7 @@ index 90d10590e5dcc4c6cd6253403f8ae34bd02e7212..948a29c5c245ed7e646378bd9b8ea1f2
Environment::~Environment() {
diff --git a/src/node.cc b/src/node.cc
index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9462f07f6 100644
index 80916e5244aa36da1e3a0a91887ab134f14f8b3d..cc634682f5aedf8f92fd6d8a9e26dfcd6b7f8ee6 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -27,6 +27,7 @@
@ -52,7 +52,7 @@ index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9
#include "node_internals.h"
#include "node_main_instance.h"
#include "node_metadata.h"
@@ -130,6 +131,9 @@ using v8::Undefined;
@@ -131,6 +132,9 @@ using v8::Undefined;
using v8::V8;
using v8::Value;
@ -62,7 +62,7 @@ index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9
namespace per_process {
// node_revert.h
@@ -325,6 +329,13 @@ MaybeLocal<Value> Environment::RunBootstrapping() {
@@ -362,6 +366,13 @@ MaybeLocal<Value> Environment::RunBootstrapping() {
CHECK(!has_run_bootstrapping_code());
@ -76,7 +76,7 @@ index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9
if (BootstrapInternalLoaders().IsEmpty()) {
return MaybeLocal<Value>();
}
@@ -716,7 +727,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
@@ -752,7 +763,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
binding::RegisterBuiltinModules();
// Make inherited handles noninheritable.
@ -87,7 +87,7 @@ index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9
#ifdef NODE_REPORT
// Cache the original command line to be
@@ -849,6 +849,8 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
@@ -849,6 +862,8 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
if (exit_code != 0) return exit_code;
}
#endif
@ -96,7 +96,7 @@ index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9
const int exit_code = ProcessGlobalArgs(argv,
exec_argv,
@@ -893,6 +895,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
@@ -893,6 +908,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
}
per_process::metadata.versions.InitializeIntlVersions();
#endif
@ -105,7 +105,7 @@ index 9d182d2aeb48c8b600bace036df868fb695dfa7c..38c467c7d49589ef5d985ad999fe22d9
NativeModuleEnv::InitializeCodeCache();
diff --git a/src/node.h b/src/node.h
index 025c6b949dc438a98a960d3630c723376f731ca7..892dafd8031533d23a88298406356107409cbd0a 100644
index aadb60ea557f43a0e1c942183fb14dc915248e59..9dc4c199ca8a9650473bc6d16238e55b3bfd6fd0 100644
--- a/src/node.h
+++ b/src/node.h
@@ -203,6 +203,9 @@ namespace node {

View file

@ -6,10 +6,10 @@ Subject: feat: add uv_loop watcher_queue code
Electron's Node Integration works by listening to Node's backend file descriptor in a separate thread; when an event is ready the backend file descriptor will trigger a new event for it, and the main thread will then iterate the libuv loop. For certain operations (ex. adding a timeout task) the backend file descriptor isn't informed, & as a result the main thread doesn't know it needs to iterate the libuv loop so the timeout task will never execute until something else trigger a new event. This commit should be removed when https://github.com/libuv/libuv/pull/1921 is merged
diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
index 0e8132e4384be02737e9a001aa2a65f76e7a1215..b79a5228c2abef854cf63dbbcd3704c14c3bb25e 100644
index 626cebabd8c9ea13410a61286e902e0b0986257b..7f1ea84a768baa0d22351456600fef20c7f3f310 100644
--- a/deps/uv/include/uv.h
+++ b/deps/uv/include/uv.h
@@ -1734,6 +1734,8 @@ union uv_any_req {
@@ -1740,6 +1740,8 @@ union uv_any_req {
struct uv_loop_s {
/* User data - use this for whatever. */
void* data;
@ -19,7 +19,7 @@ index 0e8132e4384be02737e9a001aa2a65f76e7a1215..b79a5228c2abef854cf63dbbcd3704c1
unsigned int active_handles;
void* handle_queue[2];
diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
index ffce948c9574034443203b9d2569d5f7aec1070e..ca2a755e09ac96c313737efb7b9c5880a1c158ae 100644
index 04999dce36d19383fc574a6c061b7b4d0c46f6dc..f8c523cde05fcf440423e1865920b75ad9e633a2 100644
--- a/deps/uv/src/unix/core.c
+++ b/deps/uv/src/unix/core.c
@@ -899,8 +899,11 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {

View file

@ -6,7 +6,7 @@ Subject: feat: initialize asar support
This patch initializes asar support in Node.js.
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
index 1b05d6e30a0ba004ac3c1113da3ad649a6e74dcc..2fc1151251571db91e01725353af2c8ff41af018 100644
index 1b05d6e30a0ba004ac3c1113da3ad649a6e74dcc..cef4e5086ca8160a7d715915f735963e369068b1 100644
--- a/lib/internal/bootstrap/pre_execution.js
+++ b/lib/internal/bootstrap/pre_execution.js
@@ -67,6 +67,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {

View file

@ -8,7 +8,7 @@ common.gypi is a file that's included in the node header bundle, despite
the fact that we do not build node with gyp.
diff --git a/common.gypi b/common.gypi
index b86e5e05d7df9ad472f16735448a53f433620eef..f07e65f719a1a5939997dfcae7bc787ee6391f4d 100644
index 8c9076b7352d81c44d8a177f4b039f69bce2aefb..0000f6eaea5cbfb793750c0592c1bb912cbe0a14 100644
--- a/common.gypi
+++ b/common.gypi
@@ -77,6 +77,22 @@

View file

@ -10,7 +10,7 @@ caused an unfortunate doubling-up effect; Node.js also ran bootstrapping
(called `prepareMainThreadExecution`) for all other execution paths
(like the repl, the actual main module, eval, etc).
To fix this, we can just remove bootstrapping code from `CreateEnvironment`.
To fix this, we can just remove bootstrapping code from `CreateEnvironment`.
diff --git a/lib/internal/bootstrap/environment.js b/lib/internal/bootstrap/environment.js
deleted file mode 100644
@ -32,10 +32,10 @@ index 79a67dae378202ee377f2f138560b74f673af6e4..00000000000000000000000000000000
-prepareMainThreadExecution();
-markBootstrapComplete();
diff --git a/src/api/environment.cc b/src/api/environment.cc
index 356131156b4a714eebf4e202cd105f0f184e3852..6c2e0555f2ee554c8ac29465af01e9c47e1d81f9 100644
index 8d8f820962d540c67d261a65ce5d5def5db40696..46fb07731b160765059f60bc28bd6992d4b9e36d 100644
--- a/src/api/environment.cc
+++ b/src/api/environment.cc
@@ -284,20 +284,6 @@ Environment* CreateEnvironment(IsolateData* isolate_data,
@@ -316,20 +316,6 @@ Environment* CreateEnvironment(IsolateData* isolate_data,
if (env->RunBootstrapping().IsEmpty()) {
return nullptr;
}

View file

@ -5,10 +5,10 @@ Subject: fix: expose tracing::Agent and use tracing::TracingController instead
of v8::TracingController
diff --git a/src/api/environment.cc b/src/api/environment.cc
index 138f9ada984a952a6ecf8089ddb31bc258a8d35b..356131156b4a714eebf4e202cd105f0f184e3852 100644
index 4cb2da4b860ecf147e37cb3c317d445bdf510969..8d8f820962d540c67d261a65ce5d5def5db40696 100644
--- a/src/api/environment.cc
+++ b/src/api/environment.cc
@@ -314,6 +314,10 @@ MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform() {
@@ -346,6 +346,10 @@ MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform() {
return per_process::v8_platform.Platform();
}
@ -20,7 +20,7 @@ index 138f9ada984a952a6ecf8089ddb31bc258a8d35b..356131156b4a714eebf4e202cd105f0f
int thread_pool_size,
node::tracing::TracingController* tracing_controller) {
diff --git a/src/node.h b/src/node.h
index 892dafd8031533d23a88298406356107409cbd0a..e3258434eba34124c71562225e295cd1807fdf7c 100644
index 9dc4c199ca8a9650473bc6d16238e55b3bfd6fd0..88f0bab9351a030cb316c0ccd1e25dfdc56be918 100644
--- a/src/node.h
+++ b/src/node.h
@@ -108,6 +108,7 @@ namespace node {
@ -31,7 +31,7 @@ index 892dafd8031533d23a88298406356107409cbd0a..e3258434eba34124c71562225e295cd1
class TracingController;
}
@@ -338,6 +339,8 @@ NODE_EXTERN Environment* GetCurrentEnvironment(v8::Local<v8::Context> context);
@@ -379,6 +380,8 @@ NODE_EXTERN Environment* GetCurrentEnvironment(v8::Local<v8::Context> context);
// it returns nullptr.
NODE_EXTERN MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform();

View file

@ -6,7 +6,7 @@ Subject: fix: key gen APIs are not available in BoringSSL
This will make Node's key pair generation APIs fail.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index ac2d969f60cf95e0ad4972d67d83642d7161a579..114b4d503f3c1c01aa9999cf60a044d80a39acc1 100644
index e0684d9b410c2423d805dd076330b79d22356f35..7950c68f52050b7c9a6798b653a9c831256b21b5 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -290,24 +290,14 @@ Maybe<bool> Decorate(Environment* env, Local<Object> obj,
@ -46,7 +46,7 @@ index ac2d969f60cf95e0ad4972d67d83642d7161a579..114b4d503f3c1c01aa9999cf60a044d8
{
const char* curve_name;
if (kid == EVP_PKEY_EC) {
@@ -3897,12 +3890,15 @@ Local<Value> KeyObject::GetAsymmetricKeyType() const {
@@ -3909,12 +3902,15 @@ Local<Value> KeyObject::GetAsymmetricKeyType() const {
return env()->crypto_ec_string();
case EVP_PKEY_ED25519:
return env()->crypto_ed25519_string();
@ -62,7 +62,7 @@ index ac2d969f60cf95e0ad4972d67d83642d7161a579..114b4d503f3c1c01aa9999cf60a044d8
default:
return Undefined(env()->isolate());
}
@@ -6405,6 +6401,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
@@ -6552,6 +6548,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
if (EVP_PKEY_paramgen_init(param_ctx.get()) <= 0)
return nullptr;
@ -71,7 +71,7 @@ index ac2d969f60cf95e0ad4972d67d83642d7161a579..114b4d503f3c1c01aa9999cf60a044d8
if (EVP_PKEY_CTX_set_dsa_paramgen_bits(param_ctx.get(), modulus_bits_) <= 0)
return nullptr;
@@ -6424,6 +6422,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
@@ -6571,6 +6569,8 @@ class DSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
EVPKeyCtxPointer key_ctx(EVP_PKEY_CTX_new(params.get(), nullptr));
return key_ctx;
@ -80,7 +80,7 @@ index ac2d969f60cf95e0ad4972d67d83642d7161a579..114b4d503f3c1c01aa9999cf60a044d8
}
private:
@@ -7104,9 +7104,12 @@ void Initialize(Local<Object> target,
@@ -7251,9 +7251,12 @@ void Initialize(Local<Object> target,
env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC);
env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid);
NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED25519);

View file

@ -9,7 +9,7 @@ here to clarify intent for the compiler.
Upstreamed at https://github.com/nodejs/node/pull/31758.
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index b53aab6dc16c7ae42530998c94ddc845035b1256..c6aa5751a1bbaa693b915e418de8eb69ea8139f8 100644
index b53aab6dc16c7ae42530998c94ddc845035b1256..b3ff343508be3b791e4aac827a18b3bbf64868c3 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -923,7 +923,7 @@ bool IsArrayIndex(Environment* env, Local<Value> p) {

View file

@ -7,10 +7,10 @@ This broke the build at some point. Does it still? We should probably remove
this patch and find out!
diff --git a/src/node_internals.h b/src/node_internals.h
index e8d6705e0197aad55b931910bb5221dd33b37fb0..c55ddf6988344eef5fd9efc3b24337d3b1e4cdbb 100644
index c5b4a084e85b48d5e2121a1ebcfd0c4e4b081852..b94f31f86ba1597a9d87e5beb70fccc4fe3a7aae 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -358,10 +358,11 @@ class TraceEventScope {
@@ -369,10 +369,11 @@ class TraceEventScope {
TraceEventScope(const char* category,
const char* name,
void* id) : category_(category), name_(name), id_(id) {

View file

@ -7,10 +7,10 @@ async hooks are hella broken in Electron. This was checking that they weren't,
but they are, so we just disabled the check. YOLO.
diff --git a/src/api/callback.cc b/src/api/callback.cc
index e6098d5921a038063bf8255f8af6f000becf76a0..3c518870c9c8d92f3dfcd6c270f5e023e3b69633 100644
index 355986b981a3811bcc835cf5dabcb720d2d5ee45..4dc268bc59a51e9645b2f69294d28fc11b29b364 100644
--- a/src/api/callback.cc
+++ b/src/api/callback.cc
@@ -104,12 +104,14 @@ void InternalCallbackScope::Close() {
@@ -111,12 +111,14 @@ void InternalCallbackScope::Close() {
MicrotasksScope::PerformCheckpoint(env_->isolate());
}

View file

@ -9,10 +9,10 @@ this has to be done after the upgrade to the Node.js v8.7.0. in the very beginn
to a native Node.js implementation of the function.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 112a35280391ac85665f119ded9c78e88f868542..fc0f953820fa6222ff8cca2e27d3087e05288ff5 100644
index 5300f6e6f6724de2bbfe42270a39f9123a3fd071..237b507df13497297ea00b7c2e0060333c3595c0 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -120,6 +120,8 @@ function enrichCJSError(err) {
@@ -138,6 +138,8 @@ function enrichCJSError(err) {
}
function stat(filename) {

View file

@ -6,10 +6,10 @@ Subject: Inherit ELECTRON_CRASHPAD_PIPE_NAME in child process
This is required for crashReporter to work correctly in node process.
diff --git a/lib/child_process.js b/lib/child_process.js
index d5d97c9da90281e0c24fe97a4914db12d685c7bc..a6d058c92dff927cd2fc6bcb2bb304e9ca497a31 100644
index 5ed166e1ed76b830c2d97f8170a4a72841201537..c919527a7c06f87fc5220cb7234368c4686563a3 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -107,6 +107,10 @@ function fork(modulePath /* , args, options */) {
@@ -115,6 +115,10 @@ function fork(modulePath /* , args, options */) {
options.env = Object.create(options.env || process.env)
options.env.ELECTRON_RUN_AS_NODE = 1;

View file

@ -10,10 +10,10 @@ node's module code.
(cherry picked from commit 76ba048c37588ee32636817fa7b8dffc64330cbf)
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index c37105fa1ed04bd935bc6886606553cffd56a654..4bd467849ccf98ba17e0f4615d1df5febf878173 100644
index ed433e1b8744ea204ddc3d343f776cb3d77dd05f..b83788989198cea230ac2eed10953416d956202c 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -1110,8 +1110,8 @@ Module._initPaths = function() {
@@ -1275,8 +1275,8 @@ Module._initPaths = function() {
modulePaths = paths;

View file

@ -9,7 +9,7 @@ be overridden. This patch can be removed once the relevant version of V8
makes its way into Node.js
diff --git a/src/node_internals.h b/src/node_internals.h
index c55ddf6988344eef5fd9efc3b24337d3b1e4cdbb..892c7a5ca870a3e57b08bed5a81cce6ab0fc39ee 100644
index b94f31f86ba1597a9d87e5beb70fccc4fe3a7aae..fb155265bdc31fd443065d33c0b4d7d5f373a643 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -115,7 +115,7 @@ class NodeArrayBufferAllocator : public ArrayBufferAllocator {

View file

@ -6,7 +6,7 @@ Subject: Pass all globals through "require"
(cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62)
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 7b1c1c5f16e6cc68be6a7188572c0a502ba73148..0265ce3f06405d4df5128ce1918be228d6eaa451 100644
index b83788989198cea230ac2eed10953416d956202c..5300f6e6f6724de2bbfe42270a39f9123a3fd071 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -101,6 +101,13 @@ const {
@ -23,7 +23,7 @@ index 7b1c1c5f16e6cc68be6a7188572c0a502ba73148..0265ce3f06405d4df5128ce1918be228
const isWindows = process.platform === 'win32';
const relativeResolveCache = ObjectCreate(null);
@@ -1152,10 +1159,12 @@ Module.prototype._compile = function(content, filename) {
@@ -1153,10 +1160,12 @@ Module.prototype._compile = function(content, filename) {
if (requireDepth === 0) statCache = new Map();
if (inspectorWrapper) {
result = inspectorWrapper(compiledWrapper, thisValue, exports,

View file

@ -7,7 +7,7 @@ We use this to allow node's 'fs' module to read from ASAR files as if they were
a real filesystem.
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 18acd9d2b64774efdb9261e69923a5ba320a7f0e..0f36697ce5ed0b5bb6df74ceca219574da7eea53 100644
index bb9a2b177c4304496dab1f1beaedc1ae9d9f55d9..36d06759aac57b1aa813b52c94e2168b8a8f9087 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -57,6 +57,10 @@ setupBuffer();
@ -22,10 +22,10 @@ index 18acd9d2b64774efdb9261e69923a5ba320a7f0e..0f36697ce5ed0b5bb6df74ceca219574
process.config = JSONParse(internalBinding('native_module').config);
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index fc0f953820fa6222ff8cca2e27d3087e05288ff5..2fddd3766ffb28dc9176ed1b7a4b01361dd72fcd 100644
index 237b507df13497297ea00b7c2e0060333c3595c0..22912e7c89b4cba78315269c3e009bfca1ccec27 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -42,10 +42,7 @@ const assert = require('internal/assert');
@@ -54,10 +54,7 @@ const assert = require('internal/assert');
const fs = require('fs');
const internalFS = require('internal/fs/utils');
const path = require('path');
@ -37,7 +37,7 @@ index fc0f953820fa6222ff8cca2e27d3087e05288ff5..2fddd3766ffb28dc9176ed1b7a4b0136
const { safeGetenv } = internalBinding('credentials');
const {
makeRequireFunction,
@@ -120,14 +117,12 @@ function enrichCJSError(err) {
@@ -138,14 +135,12 @@ function enrichCJSError(err) {
}
function stat(filename) {
@ -53,7 +53,7 @@ index fc0f953820fa6222ff8cca2e27d3087e05288ff5..2fddd3766ffb28dc9176ed1b7a4b0136
if (statCache !== null) statCache.set(filename, result);
return result;
}
@@ -233,7 +228,7 @@ function readPackage(requestPath) {
@@ -251,7 +246,7 @@ function readPackage(requestPath) {
const existing = packageJsonCache.get(jsonPath);
if (existing !== undefined) return existing;

View file

@ -7,10 +7,10 @@ Subject: refactor: alter child_process.fork to use execute script with
When forking a child script, we setup a special environment to make the Electron binary run like the upstream node. On Mac, we use the helper app as node binary.
diff --git a/lib/child_process.js b/lib/child_process.js
index 42b04bb9b0629372ed20840a70f768832476d767..d5d97c9da90281e0c24fe97a4914db12d685c7bc 100644
index 77bce9c386bb3f5f23a003e6e7290b2d84ac06e0..5ed166e1ed76b830c2d97f8170a4a72841201537 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -102,6 +102,15 @@ function fork(modulePath /* , args, options */) {
@@ -110,6 +110,15 @@ function fork(modulePath /* , args, options */) {
throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
}

View file

@ -7,7 +7,7 @@ Subject: refactor: TransferrableModule is deprecated, use CompiledWasmModule
This will be upstreamed to nodejs/node
diff --git a/src/node_messaging.cc b/src/node_messaging.cc
index 19065fdb7d1be5adb0f521dd27df08e5263fa40d..de92a9cc3d8cb57c2ce2a315f868b01ea9aba368 100644
index b0e7d15a8c40a6552969049c0c84628df3d54c8c..413cec135fcf00a9ed5ce4982484896b9c5272ff 100644
--- a/src/node_messaging.cc
+++ b/src/node_messaging.cc
@@ -58,7 +58,7 @@ class DeserializerDelegate : public ValueDeserializer::Delegate {

View file

@ -8,7 +8,7 @@ Node.js will pick this up when they roll next.
CL: https://chromium-review.googlesource.com/c/v8/v8/+/1868620
diff --git a/src/node_platform.h b/src/node_platform.h
index 24f7b337bb8fd7825cda4a4bfc9bafeb0f7aece2..599de93f69d2ef73b833c9138c9640202ef167a7 100644
index bebd61b0c22644881455105eeb795e4fdbcd5ae9..df7b764237ccad425d8833c9ca746170e2c838a9 100644
--- a/src/node_platform.h
+++ b/src/node_platform.h
@@ -147,14 +147,6 @@ class NodePlatform : public MultiIsolatePlatform {

View file

@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sun, 1 Mar 2020 00:25:19 -0800
Subject: Remove deprecated wasm module type check
The method was deprecated in favor of {IsWasmModuleObject}.
https://chromium-review.googlesource.com/c/v8/v8/+/2033170
diff --git a/src/node_types.cc b/src/node_types.cc
index a53bcba555448fd99d582da7dc0c7af528627ca5..e816e0af54d1cf52f2af9ded49e25625b782d5be 100644
--- a/src/node_types.cc
+++ b/src/node_types.cc
@@ -35,7 +35,7 @@ namespace {
V(DataView) \
V(SharedArrayBuffer) \
V(Proxy) \
- V(WebAssemblyCompiledModule) \
+ V(WasmModuleObject) \
V(ModuleNamespaceObject) \
diff --git a/test/parallel/test-util-types.js b/test/parallel/test-util-types.js
index 6a9bad016993339dccf8b90e1c0cf4e9d09adcc2..ddf1af8c9183dc61bac9a8bd662edec6459d253e 100644
--- a/test/parallel/test-util-types.js
+++ b/test/parallel/test-util-types.js
@@ -50,7 +50,7 @@ for (const [ value, _method ] of [
[ new DataView(new ArrayBuffer()) ],
[ new SharedArrayBuffer() ],
[ new Proxy({}, {}), 'isProxy' ],
- [ new WebAssembly.Module(wasmBuffer), 'isWebAssemblyCompiledModule' ],
+ [ new WebAssembly.Module(wasmBuffer), 'isWasmModuleObject' ],
]) {
const method = _method || `is${value.constructor.name}`;
assert(method in types, `Missing ${method} for ${inspect(value)}`);

View file

@ -8,7 +8,7 @@ The BoringSSL incompatibilities (OPENSSL_memdup) will be shimmed in and this sho
be removed when the associated update is rolled into Chromium.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 114b4d503f3c1c01aa9999cf60a044d80a39acc1..de6828fc44752789bef02d29d3320dbb6f41448a 100644
index 7950c68f52050b7c9a6798b653a9c831256b21b5..41b72d010824234c567586524d22cae6ac849edb 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5514,18 +5514,6 @@ bool PublicKeyCipher::Cipher(Environment* env,

View file

@ -0,0 +1,46 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Sun, 1 Mar 2020 13:59:57 -0800
Subject: [weakrefs] Rename FinalizationGroup to FinalizationRegistry for JS
https://chromium-review.googlesource.com/c/v8/v8/+/2071236
diff --git a/test/parallel/test-finalization-group-error.js b/test/parallel/test-finalization-group-error.js
index 0685811f55b7f8efc88e04ffd5e173ed7d415258..46a670073b1dbba9729e54166378991a7edba5a0 100644
--- a/test/parallel/test-finalization-group-error.js
+++ b/test/parallel/test-finalization-group-error.js
@@ -5,7 +5,7 @@
const common = require('../common');
const assert = require('assert');
-const g = new globalThis.FinalizationGroup(common.mustCallAtLeast(() => {
+const g = new globalThis.FinalizationRegistry(common.mustCallAtLeast(() => {
throw new Error('test');
}, 1));
g.register({}, 42);
diff --git a/test/parallel/test-finalization-group-regular-gc.js b/test/parallel/test-finalization-group-regular-gc.js
index 7a4a4797eadcf02867ad30c20b37060fa7abb5fb..3c16cfcee23e971fde8793a0478a819d3fc59d90 100644
--- a/test/parallel/test-finalization-group-regular-gc.js
+++ b/test/parallel/test-finalization-group-regular-gc.js
@@ -7,7 +7,7 @@ const assert = require('assert');
// GC (not global.gc()).
const start = Date.now();
-const g = new globalThis.FinalizationGroup(() => {
+const g = new globalThis.FinalizationRegistry(() => {
const diff = Date.now() - start;
assert(diff < 10000, `${diff} >= 10000`);
});
diff --git a/test/parallel/test-finalization-group.js b/test/parallel/test-finalization-group.js
index 3e6b9d72e356480e2b78f0b336f252d0eec641d4..4b9357e4d18e6c21d53fc6534f5af1f98805b150 100644
--- a/test/parallel/test-finalization-group.js
+++ b/test/parallel/test-finalization-group.js
@@ -4,7 +4,7 @@
const common = require('../common');
-const g = new globalThis.FinalizationGroup(common.mustCallAtLeast(1));
+const g = new globalThis.FinalizationRegistry(common.mustCallAtLeast(1));
g.register({}, 42);
setTimeout(() => {