chore: roll chromium 73.0.3683.54 (#17124)
* chore: roll chromium 73.0.3683.52 * chore: roll 73.0.3683.54
This commit is contained in:
parent
be8f9bd597
commit
28899c3885
18 changed files with 46 additions and 172 deletions
|
@ -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 dce34d55315607c60ce0adadbcf24e1ded66de70..8f4f955e423ef61710361678f532c91053867a72 100644
|
||||
index f9f8e5204d1d92e87370f859c294919d2a1991c3..ff42619d67b916bacb63f99b2391c905cccde218 100644
|
||||
--- a/content/browser/frame_host/render_frame_host_manager.cc
|
||||
+++ b/content/browser/frame_host/render_frame_host_manager.cc
|
||||
@@ -1980,6 +1980,16 @@ bool RenderFrameHostManager::InitRenderView(
|
||||
@@ -1978,6 +1978,16 @@ bool RenderFrameHostManager::InitRenderView(
|
||||
scoped_refptr<SiteInstance>
|
||||
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
const NavigationRequest& request) {
|
||||
|
@ -27,7 +27,7 @@ index dce34d55315607c60ce0adadbcf24e1ded66de70..8f4f955e423ef61710361678f532c910
|
|||
// 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();
|
||||
@@ -2012,6 +2022,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
@@ -2010,6 +2020,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
request.common_params().url);
|
||||
no_renderer_swap_allowed |=
|
||||
request.from_begin_navigation() && !can_renderer_initiate_transfer;
|
||||
|
@ -79,7 +79,7 @@ index dce34d55315607c60ce0adadbcf24e1ded66de70..8f4f955e423ef61710361678f532c910
|
|||
} else {
|
||||
// Subframe navigations will use the current renderer, unless specifically
|
||||
// allowed to swap processes.
|
||||
@@ -2023,23 +2078,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
@@ -2021,23 +2076,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||
if (no_renderer_swap_allowed && !should_swap_for_error_isolation)
|
||||
return scoped_refptr<SiteInstance>(current_site_instance);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue