Plumb opener information when creating RenderFrames and RenderFrameProxies for subframes.

content/renderer/render_frame_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 115 matching lines @@
 
 class CONTENT_EXPORT RenderFrameImpl
     : public RenderFrame,
       NON_EXPORTED_BASE(public blink::WebFrameClient),
       NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
  public:
   // Creates a new RenderFrame as the main frame of |render_view|.
   static RenderFrameImpl* CreateMainFrame(RenderViewImpl* render_view,
                                           int32 routing_id);
 
-  // Creates a new RenderFrame with |routing_id| as a child of the RenderFrame
-  // identified by |parent_routing_id| or as the top-level frame if the latter
-  // is MSG_ROUTING_NONE. If |proxy_routing_id| is MSG_ROUTING_NONE, it creates
-  // the Blink WebLocalFrame and inserts it into the frame tree after the frame
-  // identified by |previous_sibling_routing_id|, or as the first child if
+  // Creates a new RenderFrame with |routing_id|.  If |proxy_routing_id| is
+  // MSG_ROUTING_NONE, it creates the Blink WebLocalFrame and inserts it into
+  // the frame tree after the frame identified by
+  // |previous_sibling_routing_id|, or as the first child if
   // |previous_sibling_routing_id| is MSG_ROUTING_NONE. Otherwise, the frame is
   // semi-orphaned until it commits, at which point it replaces the proxy
-  // identified by |proxy_routing_id|. Note: This is called only when
+  // identified by |proxy_routing_id|.  The frame's opener is set to the frame
+  // identified by |opener_routing_id|.  The frame is created as a child of the
+  // RenderFrame identified by |parent_routing_id| or as the top-level frame if
+  // the latter is MSG_ROUTING_NONE.  Note: This is called only when
   // RenderFrame is being created in response to IPC message from the browser
   // process. All other frame creation is driven through Blink and Create.
   static void CreateFrame(int routing_id,
+                          int proxy_routing_id,
+                          int opener_routing_id,
                           int parent_routing_id,
                           int previous_sibling_routing_id,
-                          int proxy_routing_id,
                           const FrameReplicationState& replicated_state,
                           CompositorDependencies* compositor_deps,
                           const FrameMsg_NewFrame_WidgetParams& params);
 
   // Returns the RenderFrameImpl for the given routing ID.
   static RenderFrameImpl* FromRoutingID(int routing_id);
 
   // Just like RenderFrame::FromWebFrame but returns the implementation.
   static RenderFrameImpl* FromWebFrame(blink::WebFrame* web_frame);
 
@@ skipping 875 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_