chore: bump chromium to 469ca5ff317a168e6ad99ca0f23f1 (master) (#22001)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Electron Bot 2020-02-03 14:39:41 -08:00 committed by GitHub
parent a061c87e56
commit 7a3862a1c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 36 deletions

2
DEPS
View file

@ -12,7 +12,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'47114394b1c8a35438d19da7538142380551a2ce',
'2102ff0fb03469ca5ff317a168e6ad99ca0f23f1',
'node_version':
'v12.14.1',
'nan_version':

View file

@ -80,5 +80,4 @@ add_trustedauthclient_to_urlloaderfactory.patch
feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
accessible_pane_view.patch
fixme_grit_conflicts.patch
fix_add_executable_to_chromedriver_s_rpath_for_electron_8.patch
fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch

View file

@ -1,32 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Erick Zhao <ezhao@slack-corp.com>
Date: Wed, 29 Jan 2020 14:21:15 -0800
Subject: fix: add executable to chromedriver's rpath for electron 8+
Chromedriver errors on startup for Electron 8+ because FFmpeg
is not included. Adding the executable path to rpath fixes the
issue.
This is in patch form rather than copying the executable command
in Electron's BUILD.gn because one of Chromedriver's deps
(//net/server:http_server) hsa a visibility list that Electron
is not on.
diff --git a/chrome/test/chromedriver/BUILD.gn b/chrome/test/chromedriver/BUILD.gn
index 1ce029a1ba3ec9da3527008d8c2b38446ab4b2f3..de2cc3074fef3d75f041ec8230bd18d3827192cc 100644
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -330,6 +330,13 @@ executable("chromedriver") {
"//net/traffic_annotation:test_support",
"//services/network/public/mojom",
]
+ # Fixes bad rpath on Electron 8+
+ if (is_mac) {
+ ldflags = [
+ "-rpath",
+ "@executable_path/.",
+ ]
+ }
}
python_library("chromedriver_py_tests") {

View file

@ -188,7 +188,7 @@ index 23a5fe596b2607fa2b95f601cb621e4e11f81d50..67f0e98426345beac34bfd41be384210
+
// CertNetFetcher used by the context's CertVerifier. May be nullptr if
// CertNetFetcher is not used by the current platform.
scoped_refptr<cert_verifier::CertNetFetcherURLLoader> cert_net_fetcher_;
scoped_refptr<net::CertNetFetcherURLRequest> cert_net_fetcher_;
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index c37e71fb1eac0c568f91676eddcd624f491a7b69..6adfd8969148daba3f77aea4c5f89adec6338e6b 100644
--- a/services/network/public/mojom/network_context.mojom

View file

@ -35,3 +35,4 @@ 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
override_existing_v8_reallocate.patch

View file

@ -1,7 +1,7 @@
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
Subject: 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

View file

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 3 Feb 2020 10:06:45 -0800
Subject: Override existing V8 Reallocate
Refs https://chromium-review.googlesource.com/c/v8/v8/+/2007274.
Reallocate has been implemented by V8 itself, so this function must now
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
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -115,7 +115,7 @@ class NodeArrayBufferAllocator : public ArrayBufferAllocator {
void* AllocateUninitialized(size_t size) override
{ return node::UncheckedMalloc(size); }
void Free(void* data, size_t) override { free(data); }
- virtual void* Reallocate(void* data, size_t old_size, size_t size) {
+ virtual void* Reallocate(void* data, size_t old_size, size_t size) override {
return static_cast<void*>(
UncheckedRealloc<char>(static_cast<char*>(data), size));
}