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

chore: bump chromium to 1a093e6a0cb5e72ba78990fe39824 (master) (#24575)

Browse source
This commit is contained in:
Electron Bot 2020-07-21 22:34:34 -07:00 • committed by GitHub
parent d4a4269989
commit 2fb14f53fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 407 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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 e555eddccb83b91754ba95f9a2545019e6b66e1c..9d7b90476a680d44fdb903a15c1ebea0e23053c7 100644
index 6a30734d3314041af985a1f9056595a23a10d6a9..a5d5821b4de14533c286329639e3729de1e20c06 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2219,6 +2219,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2232,6 +2232,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 e555eddccb83b91754ba95f9a2545019e6b66e1c..9d7b90476a680d44fdb903a15c1ebea0
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2229,6 +2235,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2242,6 +2248,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@ -34,7 +34,7 @@ index e555eddccb83b91754ba95f9a2545019e6b66e1c..9d7b90476a680d44fdb903a15c1ebea0
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 411145b6e24b0017a67ec6d97b6ebd0d1c54c9f3..a2dff8b0cad2ee423f5365ff62f93ac5fccfaa93 100644
index f8fa0e63d7262a810dfffd08a45318ed45a66b15..17bf06d360fd5d7cbb49e64fa5b99c00267af630 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -82,8 +82,11 @@ class BrowserContext;