Track frame openers in FrameTreeNodes instead of WebContents

content/public/browser/web_contents.h

 // Copyright (c) 2012 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_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 80 matching lines @@
 
     BrowserContext* browser_context;
 
     // Specifying a SiteInstance here is optional.  It can be set to avoid an
     // extra process swap if the first navigation is expected to require a
     // privileged process.
     SiteInstance* site_instance;
 
     // The opener WebContents is the WebContents that initiated this request,
     // if any.
     WebContents* opener;

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

Let's have frame ID and process ID rather than WebContents and frame ID (where
we risk grabbing the wrong process ID for the frame ID).

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

Done.

 
+    // The routing id of the frame initiating the open.
+    int opener_render_frame_id;
+
     // If the opener is suppressed, then the new WebContents doesn't hold a
     // reference to its opener.
     bool opener_suppressed;
 
     // Indicates whether this WebContents was created with a window.opener.
     // This is used when determining whether the WebContents is allowed to be
     // closed via window.close(). This may be true even with a null |opener|
     // (e.g., for blocked popups).
     bool created_with_opener;
 
@@ skipping 554 matching lines @@
 
  private:
   // This interface should only be implemented inside content.
   friend class WebContentsImpl;
   WebContents() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_