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

chore: bump chromium to 1ba9678489174a6123358a7683f37 (master) (#22719)

Browse source 
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Andy Locascio <andy@slack-corp.com>
This commit is contained in:
Electron Bot 2020-04-06 13:09:52 -07:00 • committed by GitHub
parent c85d71903f
commit ccf70326c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 296 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/node/build_add_gn_build_files.patch
View file

@ -545,12 +545,13 @@ index 0000000000000000000000000000000000000000..da9e2b42dccacc1ed9b00202c1ff73eb
+}
diff --git a/deps/llhttp/BUILD.gn b/deps/llhttp/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..e34e241e6733b19bf1b5762ad1307af0eba383f6
index 0000000000000000000000000000000000000000..ce15bc57093caa1bd84ea77e7438e892fb916427
--- /dev/null
+++ b/deps/llhttp/BUILD.gn
@@ -0,0 +1,13 @@
@@ -0,0 +1,14 @@
+config("llhttp_config") {
+ include_dirs = [ "include" ]
+ cflags = [ "-Wno-unreachable-code" ]
+}
+
+static_library("llhttp") {
@ -616,10 +617,10 @@ index 0000000000000000000000000000000000000000..66af819990b338caa49ca59d1fe6c5ad
+}
diff --git a/deps/uv/BUILD.gn b/deps/uv/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..510d86194ed71d78b2c89c7a77422afc0ef614ad
index 0000000000000000000000000000000000000000..67116f2070bb9200aace81afdf0b1e7a6e4fd0c0
--- /dev/null
+++ b/deps/uv/BUILD.gn
@@ -0,0 +1,190 @@
@@ -0,0 +1,191 @@
+config("libuv_config") {
+ include_dirs = [ "include" ]
+
@ -664,6 +665,7 @@ index 0000000000000000000000000000000000000000..510d86194ed71d78b2c89c7a77422afc
+ "-Wno-switch",
+ "-Wno-unused-function",
+ "-Wno-unused-variable",
+ "-Wno-unreachable-code",
+ ]
+
+ libs = []

6
patches/node/fix_use_crypto_impls_for_compat.patch
View file

@ -8,10 +8,10 @@ patch works around that problem by using the implementations of those functions
found in the OpenSSL repo. I plan to upstream a version of this.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 41b72d010824234c567586524d22cae6ac849edb..b2403821bb3cab4aa4587fcb757eeb101c8a7e03 100644
index 3c2393a1c674250f7bd262ee5dbc30330c9f2a58..ac1b57efaebbef7da1bb38b587146edad81289db 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5027,7 +5027,7 @@ static unsigned int GetBytesOfRS(const ManagedEVPPKey& pkey) {
@@ -5021,7 +5021,7 @@ static unsigned int GetBytesOfRS(const ManagedEVPPKey& pkey) {
if (base_id == EVP_PKEY_DSA) {
DSA* dsa_key = EVP_PKEY_get0_DSA(pkey.get());
// Both r and s are computed mod q, so their width is limited by that of q.
@ -20,7 +20,7 @@ index 41b72d010824234c567586524d22cae6ac849edb..b2403821bb3cab4aa4587fcb757eeb10
} else if (base_id == EVP_PKEY_EC) {
EC_KEY* ec_key = EVP_PKEY_get0_EC_KEY(pkey.get());
const EC_GROUP* ec_group = EC_KEY_get0_group(ec_key);
@@ -5056,8 +5056,8 @@ static AllocatedBuffer ConvertSignatureToP1363(Environment* env,
@@ -5050,8 +5050,8 @@ static AllocatedBuffer ConvertSignatureToP1363(Environment* env,
AllocatedBuffer buf = env->AllocateManaged(2 * n);
unsigned char* data = reinterpret_cast<unsigned char*>(buf.data());

4
patches/node/revert_crypto_add_oaeplabel_option.patch
View file

@ -8,10 +8,10 @@ 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 7950c68f52050b7c9a6798b653a9c831256b21b5..41b72d010824234c567586524d22cae6ac849edb 100644
index e33a5d11ddbf900b26c1baa62f65bae49cdbaa24..3c2393a1c674250f7bd262ee5dbc30330c9f2a58 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5514,18 +5514,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
@@ -5508,18 +5508,6 @@ bool PublicKeyCipher::Cipher(Environment* env,
return false;
}

2
patches/node/weakrefs_rename_finalizationgroup_to_finalizationregistry_for_js.patch
View file

@ -1,7 +1,7 @@
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
Subject: Rename FinalizationGroup to FinalizationRegistry for JS
https://chromium-review.googlesource.com/c/v8/v8/+/2071236