Plumb opener information when creating RenderFrames and RenderFrameProxies for subframes.

content/renderer/render_frame_proxy.cc

 // Copyright 2014 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/renderer/render_frame_proxy.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 41 matching lines @@
   // always come from WebRemoteFrame::create and a call to WebFrame::swap must
   // follow later.
   blink::WebRemoteFrame* web_frame =
       blink::WebRemoteFrame::create(scope, proxy.get());
   proxy->Init(web_frame, frame_to_replace->render_view());
   return proxy.release();
 }
 
 RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
     int routing_id,
+    int render_view_routing_id,
+    int opener_routing_id,
     int parent_routing_id,
-    int render_view_routing_id,
     const FrameReplicationState& replicated_state) {
   scoped_ptr<RenderFrameProxy> proxy(
       new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
   RenderViewImpl* render_view = NULL;
   blink::WebRemoteFrame* web_frame = NULL;
   if (parent_routing_id == MSG_ROUTING_NONE) {
     // Create a top level WebRemoteFrame.
     render_view = RenderViewImpl::FromRoutingID(render_view_routing_id);
     web_frame =
         blink::WebRemoteFrame::create(replicated_state.scope, proxy.get());
     render_view->webview()->setMainFrame(web_frame);
   } else {
     // Create a frame under an existing parent. The parent is always expected
     // to be a RenderFrameProxy, because navigations initiated by local frames
     // should not wind up here.
     RenderFrameProxy* parent =
         RenderFrameProxy::FromRoutingID(parent_routing_id);
     web_frame = parent->web_frame()->createRemoteChild(
         replicated_state.scope,
         blink::WebString::fromUTF8(replicated_state.name),
         replicated_state.sandbox_flags, proxy.get());
     render_view = parent->render_view();
   }
 
+  blink::WebFrame* opener =
+      RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr);
+  web_frame->setOpener(opener);
+
   proxy->Init(web_frame, render_view);
 
   // Initialize proxy's WebRemoteFrame with the security origin and other
   // replicated information.
   // TODO(dcheng): Calling this when parent_routing_id != MSG_ROUTING_NONE is
   // mostly redundant, since we already pass the name and sandbox flags in
   // createLocalChild(). We should update the Blink interface so it also takes
   // the origin. Then it will be clear that the replication call is only needed
   // for the case of setting up a main frame proxy.
   proxy->SetReplicatedState(replicated_state);
@@ skipping 324 matching lines @@
   // Only a LocalFrame (i.e., the caller of window.open) should be able to
   // update another frame's opener.
   DCHECK(opener->isWebLocalFrame());
 
   int opener_routing_id =
       RenderFrameImpl::FromWebFrame(opener->toWebLocalFrame())->GetRoutingID();
   Send(new FrameHostMsg_DidChangeOpener(routing_id_, opener_routing_id));
 }
 
 }  // namespace