Track frame openers in FrameTreeNodes instead of WebContents

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 709071f8ad6a7ac7705111fd51d553ca883447a2..37952f52c7de39537cfcd3df8b0f8c79dd60515f 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -105,15 +105,15 @@ class CONTENT_EXPORT WebContentsImpl
 
   static WebContentsImpl* CreateWithOpener(
       const WebContents::CreateParams& params,
-      WebContentsImpl* opener);
+      FrameTreeNode* opener);
 
   static std::vector<WebContentsImpl*> GetAllWebContents();
 
   static WebContentsImpl* FromFrameTreeNode(FrameTreeNode* frame_tree_node);
 
-  // Returns the opener WebContentsImpl, if any. This can be set to null if the
-  // opener is closed or the page clears its window.opener.
-  WebContentsImpl* opener() const { return opener_; }
+  // Returns the opener WebContentsImpl, if any. This can be null if the opener
+  // is closed or the page clears its window.opener.
+  WebContentsImpl* opener() const;

[Charlie Reis, 2015/06/03 20:01:37]

Sadly, we have to change this to GetOpener now, since it's not trivial anymore. 
And it looks like GetOpener already exists in the public API (in use by
AppModalDialogHelper), so we might need to call it GetOpenerFrame?

[alexmos, 2015/06/05 22:34:32]

Done.  I renamed it to GetOpenerWebContents, thinking that this may be better
since it's returning a WebContentsImpl* and not a frame.  

Actually, there was just one use of opener() outside of WebContentsImpl, which
was only checking whether it's not null.  I changed that to use HasOpener() and
made GetOpenerWebContents() private.

 
   // Creates a swapped out RenderView. This is used by the browser plugin to
   // create a swapped out RenderView in the embedder render process for the
@@ -400,7 +400,6 @@ class CONTENT_EXPORT WebContentsImpl
   void DidAccessInitialDocument() override;
   void DidChangeName(RenderFrameHost* render_frame_host,
                      const std::string& name) override;
-  void DidDisownOpener(RenderFrameHost* render_frame_host) override;
   void DocumentOnLoadCompleted(RenderFrameHost* render_frame_host) override;
   void UpdateTitle(RenderFrameHost* render_frame_host,
                    int32 page_id,
@@ -730,8 +729,7 @@ class CONTENT_EXPORT WebContentsImpl
   class DestructionObserver;
 
   // See WebContents::Create for a description of these parameters.
-  WebContentsImpl(BrowserContext* browser_context,
-                  WebContentsImpl* opener);
+  WebContentsImpl(BrowserContext* browser_context);
 
   // Add and remove observers for page navigation notifications. The order in
   // which notifications are sent to observers is undefined. Clients must be
@@ -739,7 +737,7 @@ class CONTENT_EXPORT WebContentsImpl
   void AddObserver(WebContentsObserver* observer);
   void RemoveObserver(WebContentsObserver* observer);
 
-  // Clears this tab's opener if it has been closed.
+  // Clears a pending contents that has been closed before being shown.
   void OnWebContentsDestroyed(WebContentsImpl* web_contents);
 
   // Creates and adds to the map a destruction observer watching |web_contents|.
@@ -1015,10 +1013,6 @@ class CONTENT_EXPORT WebContentsImpl
   // the observer list then.
   ObserverList<WebContentsObserver> observers_;
 
-  // The tab that opened this tab, if any.  Will be set to null if the opener
-  // is closed.
-  WebContentsImpl* opener_;
-
   // True if this tab was opened by another tab. This is not unset if the opener
   // is closed.
   bool created_with_opener_;