Track the original opener of a webcontents so we can rely on it for popups

content/browser/web_contents/web_contents_impl.cc

 // 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.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 578 matching lines @@
 }
 
 WebContentsImpl* WebContentsImpl::CreateWithOpener(
     const WebContents::CreateParams& params,
     FrameTreeNode* opener) {
   TRACE_EVENT0("browser", "WebContentsImpl::CreateWithOpener");
   WebContentsImpl* new_contents = new WebContentsImpl(params.browser_context);
 
   FrameTreeNode* new_root = new_contents->GetFrameTree()->root();
 
-  if (!params.opener_suppressed && opener) {
-    new_root->SetOpener(opener);
-    new_contents->created_with_opener_ = true;
+  if (opener) {
+    new_root->SetOriginalOpener(opener);
+    if (!params.opener_suppressed) {
+      new_root->SetOpener(opener);
+      new_contents->created_with_opener_ = true;
+    }
   }
 
   // If the opener is sandboxed, a new popup must inherit the opener's sandbox
   // flags, and these flags take effect immediately.  An exception is if the
   // opener's sandbox flags lack the PropagatesToAuxiliaryBrowsingContexts
   // bit (which is controlled by the "allow-popups-to-escape-sandbox" token).
   // See https://html.spec.whatwg.org/#attr-iframe-sandbox.
   if (opener) {
     blink::WebSandboxFlags opener_flags = opener->effective_sandbox_flags();
     const blink::WebSandboxFlags inherit_flag =
@@ skipping 2501 matching lines @@
 
 bool WebContentsImpl::HasOpener() const {
   return GetOpener() != NULL;
 }
 
 WebContentsImpl* WebContentsImpl::GetOpener() const {
   FrameTreeNode* opener_ftn = frame_tree_.root()->opener();
   return opener_ftn ? FromFrameTreeNode(opener_ftn) : nullptr;
 }
 
+bool WebContentsImpl::HasOriginalOpener() const {
+  return GetOriginalOpener() != NULL;
+}
+
+WebContents* WebContentsImpl::GetOriginalOpener() const {
+  FrameTreeNode* opener_ftn = frame_tree_.root()->original_opener();
+  return opener_ftn ? FromFrameTreeNode(opener_ftn) : nullptr;
+}
+
 void WebContentsImpl::DidChooseColorInColorChooser(SkColor color) {
   if (!color_chooser_info_.get())
     return;
   RenderFrameHost* rfh = RenderFrameHost::FromID(
       color_chooser_info_->render_process_id,
       color_chooser_info_->render_frame_id);
   if (!rfh)
     return;
 
   rfh->Send(new FrameMsg_DidChooseColorResponse(
@@ skipping 2288 matching lines @@
   GetMainFrame()->AddMessageToConsole(
       content::CONSOLE_MESSAGE_LEVEL_WARNING,
       base::StringPrintf("This site does not have a valid SSL "
                          "certificate! Without SSL, your site's and "
                          "visitors' data is vulnerable to theft and "
                          "tampering. Get a valid SSL certificate before"
                          " releasing your website to the public."));
 }
 
 }  // namespace content