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

chore: bump chromium to 4563763ef26ad940d4e988d7245dd (master) (#23219)

Browse source 
* chore: bump chromium in DEPS to 461ecae368fd0832f18e0b13e61f3561d83f0031

* update patches

* update patches

* Remove both vs browser/child split in content gn files.

2157965

* chore: bump chromium in DEPS to 7ff3897f3104563763ef26ad940d4e988d7245dd

* update patches

* update patches

* Add ElectronKioskDelegate for extensions

2159760

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Electron Bot 2020-04-23 18:55:17 -07:00 • committed by GitHub
parent 176a120ec2
commit 37db307153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 226 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/chromium/frame_host_manager.patch
View file

@ -42,10 +42,10 @@ index 906a1ee4ac58b0744a32153bbaafeac4322a60e4..c90f4aead36cbf3767dc5094728963c2
// another SiteInstance for the same site.
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 4494c15b90f951615d1c2f08736485017256b877..f0e5e780124ee9c2b6b3a7a0d2ecc3d41eb96150 100644
index 38f5ab2f17586cc46ba9654ca1cbaf54e45ee525..fb642e30369056727809ae710ec745ac3623a267 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -1278,6 +1278,24 @@ void NavigationRequest::BeginNavigation() {
@@ -1284,6 +1284,24 @@ void NavigationRequest::BeginNavigation() {
// it immediately.
EnterChildTraceEvent("ResponseStarted", this);
@ -71,10 +71,10 @@ index 4494c15b90f951615d1c2f08736485017256b877..f0e5e780124ee9c2b6b3a7a0d2ecc3d4
render_frame_host_ =
frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 30d39b16e65dd1b099beb9f9e3cc72923fd6367d..18adc443deea3ab825c1541f9175c81e689b58f1 100644
index 1cf2081ae8642dd22ebe57e08457c26af4fad830..f7d8fb884712a921419de274106a6166ccf7e9f3 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -2392,6 +2392,16 @@ bool RenderFrameHostManager::InitRenderView(
@@ -2399,6 +2399,16 @@ bool RenderFrameHostManager::InitRenderView(
scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
NavigationRequest* request) {
@ -91,7 +91,7 @@ index 30d39b16e65dd1b099beb9f9e3cc72923fd6367d..18adc443deea3ab825c1541f9175c81e
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
// All children of MHTML documents must be MHTML documents. They all live in
@@ -2411,10 +2421,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2418,10 +2428,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
//
// TODO(clamy): We should also consider as a candidate SiteInstance the
// speculative SiteInstance that was computed on redirects.
@ -156,7 +156,7 @@ index 30d39b16e65dd1b099beb9f9e3cc72923fd6367d..18adc443deea3ab825c1541f9175c81e
// Account for renderer-initiated reload as well.
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
@@ -2457,6 +2517,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2464,6 +2524,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}
@ -167,7 +167,7 @@ index 30d39b16e65dd1b099beb9f9e3cc72923fd6367d..18adc443deea3ab825c1541f9175c81e
}
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index c1eb23c23901158410f224baebf7786b97e6df6b..d1a1aee132d8ecce9892477addd39a35de6ef9ee 100644
index f0d1e2915e89c05bb4b0f71f169b1fcdd812b004..cfb668b9250e48048d6959910c9f44c1e765d86b 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -456,6 +456,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const GURL& url) {