Handle frame openers in the same FrameTree when navigating subframes.

content/browser/frame_host/render_frame_host_manager.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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include <list>
 #include <map>
 
@@ skipping 432 matching lines @@
   // window.name property.
   void OnDidUpdateName(const std::string& name);
 
   // Send updated origin to all frame proxies when the frame navigates to a new
   // origin.
   void OnDidUpdateOrigin(const url::Origin& origin);
 
   void EnsureRenderViewInitialized(RenderViewHostImpl* render_view_host,
                                    SiteInstance* instance);
 
-  // Recursively creates swapped out RenderViews and RenderFrameProxies for
-  // this frame's FrameTree and for its opener chain in the given SiteInstance.
-  // This allows other tabs to send cross-process JavaScript calls to their
-  // opener(s) and to any other frames in the opener's FrameTree (e.g.,
-  // supporting calls like window.opener.opener.frames[x][y]).
-  void CreateOpenerProxies(SiteInstance* instance);
+  // Creates swapped out RenderViews and RenderFrameProxies for this frame's
+  // FrameTree and for its opener chain in the given SiteInstance. This allows
+  // other tabs to send cross-process JavaScript calls to their opener(s) and
+  // to any other frames in the opener's FrameTree (e.g., supporting calls like
+  // window.opener.opener.frames[x][y]).  Does not create proxies for the
+  // subtree rooted at |skip_this_node| (e.g., if a node is being navigated, it
+  // can be passed here to prevent proxies from being created for it, in
+  // case it is in the same FrameTree as another node on its opener chain).
+  void CreateOpenerProxies(SiteInstance* instance,
+                           FrameTreeNode* skip_this_node);
 
   // Ensure that this frame has proxies in all SiteInstances that can discover
   // this frame by name (e.g., via window.open("", "frame_name")).  See
   // https://crbug.com/511474.
   void CreateProxiesForNewNamedFrame();
 
   // Returns a routing ID for the current FrameTreeNode's opener node in the
   // given SiteInstance.  May return a routing ID of either a RenderFrameHost
   // (if opener's current or pending RFH has SiteInstance |instance|) or a
   // RenderFrameProxyHost.  Returns MSG_ROUTING_NONE if there is no opener, or
@@ skipping 141 matching lines @@
                                     SiteInstance* new_instance,
                                     bool is_main_frame);
 
   // Ensure that we have created all needed proxies for a new RFH with
   // SiteInstance |new_instance|: (1) create swapped-out RVHs and proxies for
   // the new RFH's opener chain if we are staying in the same BrowsingInstance;
   // (2) Create proxies for the new RFH's SiteInstance in its own frame tree.
   void CreateProxiesForNewRenderFrameHost(SiteInstance* old_instance,
                                           SiteInstance* new_instance);
 
-  // Create swapped out RenderViews and RenderFrameProxies in the given
-  // SiteInstance for all frames on the opener chain of this frame.  Same as
-  // CreateOpenerProxies, but starts from this frame's opener, calling
-  // CreateOpenerProxies on it if it exists and returning otherwise.
-  void CreateOpenerProxiesIfNeeded(SiteInstance* instance);
-
   // Traverse the opener chain and populate |opener_frame_trees| with
   // all FrameTrees accessible by following frame openers of nodes in the
   // given node's FrameTree. |opener_frame_trees| is ordered so that openers
   // of smaller-indexed entries point to larger-indexed entries (i.e., this
   // node's FrameTree is at index 0, its opener's FrameTree is at index 1,
   // etc). If the traversal encounters a node with an opener pointing to a
   // FrameTree that has already been traversed (such as when there's a cycle),
   // the node is added to |nodes_with_back_links|.
   void CollectOpenerFrameTrees(
       std::vector<FrameTree*>* opener_frame_trees,
       base::hash_set<FrameTreeNode*>* nodes_with_back_links);
 
   // Create swapped out RenderViews and RenderFrameProxies in the given
   // SiteInstance for the current node's FrameTree.  Used as a helper function
   // in CreateOpenerProxies for creating proxies in each FrameTree on the
-  // opener chain.
-  void CreateOpenerProxiesForFrameTree(SiteInstance* instance);
+  // opener chain.  Don't create proxies for the subtree rooted at
+  // |skip_this_node|.
+  void CreateOpenerProxiesForFrameTree(SiteInstance* instance,
+                                       FrameTreeNode* skip_this_node);
 
   // Creates a RenderFrameHost and corresponding RenderViewHost if necessary.
   scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(SiteInstance* instance,
                                                         int32 view_routing_id,
                                                         int32 frame_routing_id,
                                                         int32 widget_routing_id,
                                                         int32 surface_id,
                                                         int flags);
 
   // PlzNavigate
@@ skipping 165 matching lines @@
   bool should_reuse_web_ui_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_