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

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

Issue 1118083004: Revert of OOPIF: Specify previous sibling frames when creating new RenderFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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 769bc4a9d52cc10c45ccf87c8e0ad1d0135fbed2..e134c92946e9b0630e2ef8f971691e92d4348d5c 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1651,28 +1651,12 @@
return true;
int parent_routing_id = MSG_ROUTING_NONE;
- int previous_sibling_routing_id = MSG_ROUTING_NONE;
int proxy_routing_id = MSG_ROUTING_NONE;
-
if (frame_tree_node_->parent()) {
parent_routing_id = frame_tree_node_->parent()->render_manager()->
GetRoutingIdForSiteInstance(render_frame_host->GetSiteInstance());
CHECK_NE(parent_routing_id, MSG_ROUTING_NONE);
}
-
- // At this point, all RenderFrameProxies for sibling frames have already been
- // created, including any proxies that come after this frame. To preserve
- // correct order for indexed window access (e.g., window.frames[1]), pass the
- // previous sibling frame so that this frame is correctly inserted into the
- // frame tree on the renderer side.
- FrameTreeNode* previous_sibling = frame_tree_node_->PreviousSibling();
- if (previous_sibling) {
- previous_sibling_routing_id =
- previous_sibling->render_manager()->GetRoutingIdForSiteInstance(
- render_frame_host->GetSiteInstance());
- CHECK_NE(previous_sibling_routing_id, MSG_ROUTING_NONE);
- }
-
// Check whether there is an existing proxy for this frame in this
// SiteInstance. If there is, the new RenderFrame needs to be able to find
// the proxy it is replacing, so that it can fully initialize itself.
@@ -1688,9 +1672,9 @@
if (!existing_proxy->is_render_frame_proxy_live())
existing_proxy->InitRenderFrameProxy();
}
- return delegate_->CreateRenderFrameForRenderManager(
- render_frame_host, parent_routing_id, previous_sibling_routing_id,
- proxy_routing_id);
+ return delegate_->CreateRenderFrameForRenderManager(render_frame_host,
+ parent_routing_id,
+ proxy_routing_id);
}
int RenderFrameHostManager::GetRoutingIdForSiteInstance(
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698