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

chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499)

Browse source 
* chore: bump chromium in DEPS to c04c17506a1b5941370b91dfa44eda7ec31e9793

* update patches

* chore: bump chromium in DEPS to 8a4687263763f306659d04cef8f0a12a9e504d57

* chore: bump chromium in DEPS to 3a75ada69d1ac06d6903a2c981ab90a8162f1ba0

* update patches

* chore: sync StartRemoteDebuggingPipeHandler usage

CL: 2536354

Added 'on_disconnect' OnceClosure arg to StartRemoteDebuggingPipeHandler

* chore: add WebSocketHandshakeClient::OnFailurea

CL: 2527889

Add an empty stub to satisfy parent class' pure virtual method OnFailure().
NB: Use of empty impl comes from WebRequestProxyingWebSocket.

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Electron Bot 2020-11-16 17:57:42 -08:00 • committed by GitHub
parent a9924e1c32
commit cad2d8b4aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 119 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/chromium/resource_file_conflict.patch
View file

@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index f721f1aff4781fa5936010dfb5b0c97587e81c05..7dd531f3d01590687ec14a013bb67503ce3347b0 100644
index c0dfc37280e6161f5396bf10184fe9f5ceca1a4f..eead20c2b78cfdc598da3fefb422e036d2a4d7aa 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1448,7 +1448,7 @@ if (is_chrome_branded && !is_android) {
@@ -1449,7 +1449,7 @@ if (is_chrome_branded && !is_android) {
}
}
@ -64,7 +64,7 @@ index f721f1aff4781fa5936010dfb5b0c97587e81c05..7dd531f3d01590687ec14a013bb67503
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1468,6 +1468,12 @@ if (!is_android) {
@@ -1469,6 +1469,12 @@ if (!is_android) {
}
}