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

chore: bump chromium to bc8f70ed4cfe2262ea833750eaddb (master) (#22649)

Browse source 
* chore: bump chromium in DEPS to 9321f32fb1b3af8fdfce55c7bbfacf3f75118dca

* Update patches

* Update electron_swiftshader_binaries deps

2056931

* Use Promise with RequestPointerLock calls

2069199

* Replace content::CursorInfo with ui::Cursor

1999201

* Convert MaterialDesignController to a true singleton.

2090877

* Drop WebContentsView::RenderViewCreated hook

2093535

* chore: bump chromium in DEPS to 6478123cfa0102ed754c70eb9bbdd391d676a4dd

* Splitting context_menu_params.h into separate browser VS common parts.

2097468

* Fix DCHECK on OnThemeChanged()

2090713

* chore: bump chromium in DEPS to b0269bb003f699bc8ea7dcba8b0795ef963696d7

* Remove no longer needed patch

* Check PointerLock requests for new options and update accordingly

2071788

* Address issues from review

* Fixup compile error

* Add additional library files

* chore: bump chromium in DEPS to a41285fb8aebc8f70ed4cfe2262ea833750eaddb

* Update patches

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot 2020-03-14 13:54:14 -07:00 • committed by GitHub
parent a4c4c86b9d
commit d8737734bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 267 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/chromium/expose_setuseragent_on_networkcontext.patch
View file

@ -33,7 +33,7 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970
DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
};
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 9d340a9207d2e0b71e0726a0904282e160e036ae..f827654c8480ee9618ea48b418a5469882f4c1d3 100644
index 80ecc470ab4ed4ce1cb797f7f11fe971c953145d..36521baf33900fe9ec411a365918a675fb147080 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1006,6 +1006,13 @@ void NetworkContext::SetNetworkConditions(
@ -51,10 +51,10 @@ index 9d340a9207d2e0b71e0726a0904282e160e036ae..f827654c8480ee9618ea48b418a54698
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index abc82d01185e1d3320bfd82bcd1705423e325ff2..b6885b6ebaf78d384a3f124ec6ef07b711ccbe10 100644
index 8ccb5c4d0c37a5dc0c7fa713683941eaddc1c609..260f0e205b537be6b82eb6847d78d02122a054e1 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -235,6 +235,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -233,6 +233,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
mojom::NetworkConditionsPtr conditions) override;