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

12
patches/chromium/web_contents.patch
View file

@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 84587a78262128fb03bad83e8b51cba2755eab6c..611ba2b46eaf4f3d9b69c3c1eeb7824a3a9ece48 100644
index b57520fe4254335fd31bb86673d30e79c0656d51..6f2e0c12e7b4a2928346f6690c2e8a072822124b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2100,6 +2100,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2066,6 +2066,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -25,7 +25,7 @@ index 84587a78262128fb03bad83e8b51cba2755eab6c..611ba2b46eaf4f3d9b69c3c1eeb7824a
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2110,6 +2116,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2076,6 +2082,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@ -34,10 +34,10 @@ index 84587a78262128fb03bad83e8b51cba2755eab6c..611ba2b46eaf4f3d9b69c3c1eeb7824a
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 65d6373115587dea79ef33b28ec898e9142f08ea..b28d70d9288fa94a55c4d460c68df1a38a2dfbff 100644
index cf98180740c4adaf0082e987e4b7fc482b11d348..376aaaebcb45b078c59f013437ac9baf7c9dd037 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -78,9 +78,12 @@ class BrowserPluginGuestDelegate;
@@ -82,9 +82,12 @@ class BrowserPluginGuestDelegate;
class InterstitialPage;
class RenderFrameHost;
class RenderViewHost;
@ -50,7 +50,7 @@ index 65d6373115587dea79ef33b28ec898e9142f08ea..b28d70d9288fa94a55c4d460c68df1a3
class WebUI;
struct CustomContextMenuContext;
struct DropData;
@@ -213,6 +216,10 @@ class WebContents : public PageNavigator,
@@ -209,6 +212,10 @@ class WebContents : public PageNavigator,
kInitializeAndWarmupRendererProcess,
} desired_renderer_state;