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 b9328a40b2539c35bda23a47ff0299f2e67c4949..a71735301c616826f817e3f3de5158f62471c46c 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.cc |
+++ b/content/browser/frame_host/render_frame_host_manager.cc |
@@ -720,9 +720,16 @@ RenderFrameHostImpl* RenderFrameHostManager::GetFrameHostForNavigation( |
// The appropriate RenderFrameHost to commit the navigation. |
RenderFrameHostImpl* navigation_rfh = nullptr; |
- // TODO(carlosk): do not swap processes for renderer initiated navigations |
+ // TODO(carlosk): Renderer-initiated navigations that may require a |
+ // SiteInstance swap are sent to the browser via the OpenURL IPC, and are |
+ // afterwards treated as browser-initiated navigations. The only |
+ // NavigationRequests marked as renderer-initiated are created by receiving a |
+ // BeginNavigation IPC, and will then proceed in the same renderer that sent |
+ // the IPC due to the condition below. Once there is support for cross-process |
clamy
2015/03/06 16:58:16
No I meant the TODO should start at "Once there is
carlosk
2015/03/06 17:44:45
Sorry, me too. I forgot to save the file after upd
|
+ // scripting check for non-browser-initiated navigations should be removed |
// (see crbug.com/440266). |
if (current_site_instance == dest_site_instance.get() || |
+ !request.browser_initiated() || |
(!frame_tree_node_->IsMainFrame() && |
!base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kSitePerProcess))) { |