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

rebase patches

Browse source
This commit is contained in:
Jeremy Apthorp 2019-05-21 10:05:21 -07:00
parent c832533f5f
commit 446944c677
35 changed files with 180 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/common/chromium/frame_host_manager.patch
View file

@ -7,10 +7,10 @@ Allows embedder to intercept site instances chosen by chromium
and respond with custom instance.
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453fa193c5bb 100644
index ce9c79b32823b5f6f7edfdc14112bb1ed70e98ba..0708e35ff066b793121862a755081b2db2aad086 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -2140,6 +2140,16 @@ bool RenderFrameHostManager::InitRenderView(
@@ -2141,6 +2141,16 @@ bool RenderFrameHostManager::InitRenderView(
scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
const NavigationRequest& request) {
@ -27,7 +27,7 @@ index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453f
// First, check if the navigation can switch SiteInstances. If not, the
// navigation should use the current SiteInstance.
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
@@ -2172,6 +2182,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2173,6 +2183,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request.common_params().url);
no_renderer_swap_allowed |=
request.from_begin_navigation() && !can_renderer_initiate_transfer;
@ -79,7 +79,7 @@ index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453f
} else {
// Subframe navigations will use the current renderer, unless specifically
// allowed to swap processes.
@@ -2183,23 +2238,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2184,23 +2239,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
if (no_renderer_swap_allowed && !should_swap_for_error_isolation)
return scoped_refptr<SiteInstance>(current_site_instance);
@ -108,7 +108,7 @@ index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453f
}
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 66280289f51a89dcd17c288569348efa18227e9b..0569c5b0ae4bed017c9b240689aef647f099d57e 100644
index de19cb3a5f3d6685d8dede7c3cdb5b47183ed07f..acf458d5c088607d3ceb6d058f28f076bf4cf712 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -51,6 +51,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info,
@ -129,7 +129,7 @@ index 66280289f51a89dcd17c288569348efa18227e9b..0569c5b0ae4bed017c9b240689aef647
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index f0e60c3e8c135712db5cb8e918109f249502bee9..6219857d40d63f1d6918d941b31c80f3729a8dba 100644
index 2c722d14437cdad69544e0c67921dbaec15b97da..9c7c77b44d279219411ce545c5448acecbd56d59 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -210,8 +210,37 @@ CONTENT_EXPORT void OverrideOnBindInterface(