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

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

Issue 2964033002: Disable cross-process navigations in --single-process. (Closed)
Patch Set: Only update --site-per-process Created 3 years, 5 months 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 | « content/browser/frame_host/render_frame_host_manager.h ('k') | content/browser/site_instance_impl.cc » ('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 25940df91acb23e7939d2f95815b8117cc0a5fa7..f66dac33cdaf72794e6c0aaaa5bf9e34212b7aac 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1039,30 +1039,10 @@ void RenderFrameHostManager::DeleteRenderFrameProxyHost(
}
bool RenderFrameHostManager::ShouldTransitionCrossSite() {
- // The logic below is weaker than "are all sites isolated" -- it asks instead,
- // "is any site isolated". That's appropriate here since we're just trying to
- // figure out if we're in any kind of site isolated mode, and in which case,
- // we ignore the kSingleProcess and kProcessPerTab settings.
- //
- // TODO(nick): Move all handling of kSingleProcess/kProcessPerTab into
- // SiteIsolationPolicy so we have a consistent behavior around the interaction
- // of the process model flags.
- //
- // TODO(creis, alexmos): This looks like it will break single-process and
- // process-per-tab. See https://crbug.com/688617.
- if (SiteIsolationPolicy::AreCrossProcessFramesPossible())
- return true;
-
- // False in the single-process mode, as it makes RVHs to accumulate
- // in swapped_out_hosts_.
- // True if we are using process-per-site-instance (default) or
- // process-per-site (kProcessPerSite).
- // TODO(nick): Move handling of kSingleProcess and kProcessPerTab into
- // SiteIsolationPolicy.
+ // False in single-process mode, which does not support cross-process
+ // navigations or OOPIFs.
return !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSingleProcess) &&
- !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kProcessPerTab);
+ switches::kSingleProcess);
}
bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | content/browser/site_instance_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698