Index: content/browser/frame_host/render_frame_host_manager.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc |
index 5ae522b0a7b448c1cf8ab395d06544110703e08e..91baedcec1f70c251fc429729b58200d223aff91 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.cc |
+++ b/content/browser/frame_host/render_frame_host_manager.cc |
@@ -1454,6 +1454,32 @@ RenderFrameHostManager::DetermineSiteInstanceForURL( |
SiteInstanceRelation::RELATED_DEFAULT_SUBFRAME); |
} |
+ // Subframes should be kept in the parent's SiteInstance unless a dedicated |
+ // process is required for either the parent or the subframe's destination |
+ // URL. See https://crbug.com/711006. Note that this should be |
+ // enforced after the TopDocumentIsolation checks above. |
Charlie Reis
2017/04/14 16:57:05
I'm slightly wary about this invariant, since it f
alexmos
2017/04/17 17:36:02
Thanks, I agree. I updated the comment - let me k
|
+ if (!frame_tree_node_->IsMainFrame()) { |
+ RenderFrameHostImpl* parent = |
+ frame_tree_node_->parent()->current_frame_host(); |
+ bool dest_url_requires_dedicated_process = |
+ SiteInstanceImpl::DoesSiteRequireDedicatedProcess(browser_context, |
+ dest_url); |
+ // Web iframes embedded in DevTools extensions should not reuse the parent |
+ // SiteInstance, but DevTools extensions are currently kept in the DevTools |
+ // SiteInstance, which is not considered to require a dedicated process. |
+ // Work around this by also checking whether the parent's URL requires a |
+ // dedicated process. |
+ // TODO(alexmos, nick): Remove this once https://crbug.com/706169 is fixed. |
+ bool parent_url_requires_dedicated_process = |
+ SiteInstanceImpl::DoesSiteRequireDedicatedProcess( |
+ browser_context, parent->last_successful_url()); |
+ if (!parent->GetSiteInstance()->RequiresDedicatedProcess() && |
+ !dest_url_requires_dedicated_process && |
+ !parent_url_requires_dedicated_process) { |
alexmos
2017/04/14 00:15:46
Sigh, without this workaround, the devtools extens
Charlie Reis
2017/04/14 16:57:05
Fun. Devtools definitely should require a dedicat
|
+ return SiteInstanceDescriptor(parent->GetSiteInstance()); |
+ } |
+ } |
+ |
// Start the new renderer in a new SiteInstance, but in the current |
// BrowsingInstance. |
return SiteInstanceDescriptor(browser_context, dest_url, |