chore: bump chromium to 4b6692e4cc2839729bb7ac009586a (master) (#21864)

* chore: bump chromium in DEPS to a1ea0d7aedd6b5fe58fbabfa3b05aa8ee41304ff

* update patches

* update extensions code

* Remove WebPoint

2007474

* fix build

* chore: bump chromium in DEPS to 9351e26c2a3714f8bbb10789c71bb51b0b494c75

* update patches

* Remove error description from the DidFailLoadWithError message

2011280

* Make SimpleNetworkHintsHandlerImpl use the right NetworkIsolationKey

1994430

* Rename libgtkui to gtk

2011683

* [metrics] Remove histogram Startup.WarmStartTimeFromRemoteProcessStart*.

2003211

* fix requestSingleInstanceLock test

* chore: bump chromium in DEPS to a813567a4f17ea08292c2b26fa10d0ffd47010d9

* chore: bump chromium in DEPS to f0aca2de536ceecd6eb66e928051d11e6d11991f

* chore: bump chromium in DEPS to 865556af6d0c9d990f5b1816cb792f7c3859667b

* chore: bump chromium in DEPS to 98538fdd28c4b6692e4cc2839729bb7ac009586a

* update patches

* fix broken tests

* Update node tests for v8 changes

* Update node patches for test failures

* Update for number of tests

Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot 2020-01-29 04:01:37 -08:00 committed by GitHub
parent 0bd8a97f38
commit 2b53788c35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 260 additions and 231 deletions

View file

@ -32,3 +32,6 @@ enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
fix_remove_unused_llhttp_variables.patch
fix_include_libuv_header_in_node_binding.patch
remove_deprecated_task_api_override_removed_in_latest_v8.patch
remove_serialization_deserialization_of_wasmmoduleobject.patch
64bit_bump_typedarray_max_length_to_2_32-1_elements.patch
test_use_tmpdir_refresh_in_test-esm-windows_js.patch

View file

@ -0,0 +1,44 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Tue, 28 Jan 2020 12:16:11 -0500
Subject: [64bit] Bump TypedArray max length to 2**32-1 elements
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
--- a/test/parallel/test-buffer-alloc.js
+++ b/test/parallel/test-buffer-alloc.js
@@ -8,8 +8,8 @@ const SlowBuffer = require('buffer').SlowBuffer;
// Verify the maximum Uint8Array size. There is no concrete limit by spec. The
// internal limits should be updated if this fails.
assert.throws(
- () => new Uint8Array(2 ** 31),
- { message: 'Invalid typed array length: 2147483648' }
+ () => new Uint8Array(2 ** 32),
+ { message: 'Invalid typed array length: 4294967296' }
);
const b = Buffer.allocUnsafe(1024);
diff --git a/test/parallel/test-buffer-over-max-length.js b/test/parallel/test-buffer-over-max-length.js
index b1267b19ff439e344417a85649667facb0d2add7..5a738050eda9c0adad862d318f390af112330c14 100644
--- a/test/parallel/test-buffer-over-max-length.js
+++ b/test/parallel/test-buffer-over-max-length.js
@@ -10,7 +10,7 @@ const bufferMaxSizeMsg = common.expectsError({
code: 'ERR_INVALID_OPT_VALUE',
type: RangeError,
message: /^The value "[^"]*" is invalid for option "size"$/
-}, 12);
+}, 10);
assert.throws(() => Buffer((-1 >>> 0) + 1), bufferMaxSizeMsg);
assert.throws(() => SlowBuffer((-1 >>> 0) + 1), bufferMaxSizeMsg);
@@ -23,7 +23,3 @@ assert.throws(() => SlowBuffer(kMaxLength + 1), bufferMaxSizeMsg);
assert.throws(() => Buffer.alloc(kMaxLength + 1), bufferMaxSizeMsg);
assert.throws(() => Buffer.allocUnsafe(kMaxLength + 1), bufferMaxSizeMsg);
assert.throws(() => Buffer.allocUnsafeSlow(kMaxLength + 1), bufferMaxSizeMsg);
-
-// issue GH-4331
-assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFF), bufferMaxSizeMsg);
-assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFFF), bufferMaxSizeMsg);

View file

@ -5,12 +5,12 @@ Subject: fix: include libuv header in node_binding
The libuv header uv.h was removed in
https://github.com/nodejs/node/commit/3bb085dbad4d23030c731834e35b2804c8a50b23,
but is necessary for Windows to understand what uv_lib_t is.
but is necessary for Windows to understand what uv_lib_t is.
Upstreamed in https://github.com/nodejs/node/pull/31265.
diff --git a/src/node_binding.h b/src/node_binding.h
index cefb6419ebb7f5c5c79927d179eef0a790e234ad..5bced5b41431dc7838d1a30774a1a41ff797290e 100644
index cefb6419ebb7f5c5c79927d179eef0a790e234ad..4233ee968fb4b3b5456997cbf1450ecf07392455 100644
--- a/src/node_binding.h
+++ b/src/node_binding.h
@@ -10,6 +10,7 @@

View file

@ -8,10 +8,10 @@ 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 d2eb325c12113e3066596cae4b0b0e9dce16c1b6..9a7395f6c93d7a90e41ad6f4263e6bdefdcc0824 100644
index 24f7b337bb8fd7825cda4a4bfc9bafeb0f7aece2..599de93f69d2ef73b833c9138c9640202ef167a7 100644
--- a/src/node_platform.h
+++ b/src/node_platform.h
@@ -145,14 +145,6 @@ class NodePlatform : public MultiIsolatePlatform {
@@ -147,14 +147,6 @@ class NodePlatform : public MultiIsolatePlatform {
void CallOnWorkerThread(std::unique_ptr<v8::Task> task) override;
void CallDelayedOnWorkerThread(std::unique_ptr<v8::Task> task,
double delay_in_seconds) override;

View file

@ -0,0 +1,32 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Tue, 28 Jan 2020 12:12:28 -0500
Subject: Remove serialization/deserialization of WasmModuleObject
Serialization of WasmModuleObject was removed here:
https://chromium.googlesource.com/v8/v8/+/30e4ba6df4cdf5582de4d79850bcd270e6a75a7a
diff --git a/test/parallel/test-v8-serdes.js b/test/parallel/test-v8-serdes.js
index a992ba42ce46bfcdccdca997ee13718086d3256d..62096edec540ec3dd70e56fee53b9813b2ebbbfc 100644
--- a/test/parallel/test-v8-serdes.js
+++ b/test/parallel/test-v8-serdes.js
@@ -23,8 +23,7 @@ const objects = [
undefined,
null,
42,
- circular,
- wasmModule
+ circular
];
const hostObject = new (internalBinding('js_stream').JSStream)();
@@ -236,9 +235,3 @@ const deserializerTypeError =
/^TypeError: buffer must be a TypedArray or a DataView$/,
);
}
-
-{
- const deserializedWasmModule = v8.deserialize(v8.serialize(wasmModule));
- const instance = new WebAssembly.Instance(deserializedWasmModule);
- assert.strictEqual(instance.exports.add(10, 20), 30);
-}

View file

@ -0,0 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Richard Lau <riclau@uk.ibm.com>
Date: Mon, 16 Dec 2019 16:25:31 -0500
Subject: test: use tmpdir.refresh() in test-esm-windows.js
Use `tmpdir.refresh()` in `test/es-module/test-esm-windows.js` so
that the temporary directory is cleaned before use and when the test
exits.
PR-URL: https://github.com/nodejs/node/pull/30997
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
(cherry picked from commit e23aebc684a45f725811211f9740bcee3bcdbe26)
diff --git a/test/es-module/test-esm-windows.js b/test/es-module/test-esm-windows.js
index 64ba1249a76c06ee3461b56f7ac69a650e6fbfcc..44af65d6a4e0315b31508cab3183c0142ff0d17c 100644
--- a/test/es-module/test-esm-windows.js
+++ b/test/es-module/test-esm-windows.js
@@ -15,9 +15,8 @@ const imp = (file) => {
};
(async () => {
- const tmp = tmpdir.path;
- await fs.mkdir(tmp).catch(() => {});
- const rel = (file) => path.join(tmp, file);
+ tmpdir.refresh();
+ const rel = (file) => path.join(tmpdir.path, file);
{ // Load a single script
const file = rel('con.mjs');