Plumb opener information when creating RenderFrames and RenderFrameProxies for subframes.

content/browser/frame_host/render_frame_host_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_frame_host_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 1956 matching lines @@
   return delegate_->CreateRenderViewForRenderManager(
       render_view_host, opener_frame_routing_id, proxy_routing_id,
       frame_tree_node_->current_replication_state(), for_main_frame_navigation);
 }
 
 bool RenderFrameHostManager::InitRenderFrame(
     RenderFrameHostImpl* render_frame_host) {
   if (render_frame_host->IsRenderFrameLive())
     return true;
 
+  SiteInstance* site_instance = render_frame_host->GetSiteInstance();
+
+  int opener_routing_id = MSG_ROUTING_NONE;
+  if (frame_tree_node_->opener())
+    opener_routing_id = GetOpenerRoutingID(site_instance);
+
   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());
+    parent_routing_id = frame_tree_node_->parent()
+                            ->render_manager()
+                            ->GetRoutingIdForSiteInstance(site_instance);
     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.
+  int previous_sibling_routing_id = MSG_ROUTING_NONE;
   FrameTreeNode* previous_sibling = frame_tree_node_->PreviousSibling();
   if (previous_sibling) {
     previous_sibling_routing_id =
         previous_sibling->render_manager()->GetRoutingIdForSiteInstance(
-            render_frame_host->GetSiteInstance());
+            site_instance);
     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.
   // NOTE: This is the only time that a RenderFrameProxyHost can be in the same
   // SiteInstance as its RenderFrameHost. This is only the case until the
   // RenderFrameHost commits, at which point it will replace and delete the
   // RenderFrameProxyHost.
-  RenderFrameProxyHost* existing_proxy =
-      GetRenderFrameProxyHost(render_frame_host->GetSiteInstance());
+  int proxy_routing_id = MSG_ROUTING_NONE;
+  RenderFrameProxyHost* existing_proxy = GetRenderFrameProxyHost(site_instance);
   if (existing_proxy) {
     proxy_routing_id = existing_proxy->GetRoutingID();
     CHECK_NE(proxy_routing_id, MSG_ROUTING_NONE);
     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);
+      render_frame_host, proxy_routing_id, opener_routing_id, parent_routing_id,
+      previous_sibling_routing_id);
 }
 
 int RenderFrameHostManager::GetRoutingIdForSiteInstance(
     SiteInstance* site_instance) {
   if (render_frame_host_->GetSiteInstance() == site_instance)
     return render_frame_host_->GetRoutingID();
 
   // If there is a matching pending RFH, only return it if swapped out is
   // allowed, since otherwise there should be a proxy that should be used
   // instead.
@@ skipping 541 matching lines @@
 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) {
   if (!frame_tree_node_->opener())
     return MSG_ROUTING_NONE;
 
   return frame_tree_node_->opener()
       ->render_manager()
       ->GetRoutingIdForSiteInstance(instance);
 }
 
 }  // namespace content