Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 2499313002: Don't split off NTP subframes with TDI. (Closed)
Patch Set: updates Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e174e54d379ca834c1016b919b53d5325fb0ce0d..ea32eb5b3caf99da3588bf1330478a5813855194 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1436,6 +1436,13 @@ RenderFrameHostManager::DetermineSiteInstanceForURL(
SiteIsolationPolicy::IsTopDocumentIsolationEnabled() &&
!SiteInstanceImpl::DoesSiteRequireDedicatedProcess(browser_context,
dest_url)) {
+ if (GetContentClient()
+ ->browser()
+ ->ShouldFrameShareParentSiteInstanceDespiteTopDocumentIsolation(
+ dest_url, current_instance)) {
+ return SiteInstanceDescriptor(render_frame_host_->GetSiteInstance());
+ }
+
// This is a cross-site subframe of a non-isolated origin, so place this
// frame in the default subframe site instance.
return SiteInstanceDescriptor(
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698