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

content/browser/frame_host/frame_tree_node.cc

 // 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.
 
 #include "content/browser/frame_host/frame_tree_node.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 33 matching lines @@
 void RecordUniqueNameLength(size_t length) {
   UMA_HISTOGRAM_COUNTS("SessionRestore.FrameUniqueNameLength", length);
 }
 
 }  // namespace
 
 // This observer watches the opener of its owner FrameTreeNode and clears the
 // owner's opener if the opener is destroyed.
 class FrameTreeNode::OpenerDestroyedObserver : public FrameTreeNode::Observer {
  public:
-  OpenerDestroyedObserver(FrameTreeNode* owner) : owner_(owner) {}
+  OpenerDestroyedObserver(FrameTreeNode* owner, bool observing_original_opener)
+      : owner_(owner), observing_original_opener_(observing_original_opener) {}
 
   // FrameTreeNode::Observer
   void OnFrameTreeNodeDestroyed(FrameTreeNode* node) override {
-    CHECK_EQ(owner_->opener(), node);
-    owner_->SetOpener(nullptr);
+    if (observing_original_opener_) {
+      CHECK_EQ(owner_->original_opener(), node);
+      owner_->SetOriginalOpener(nullptr);
+    } else {
+      CHECK_EQ(owner_->opener(), node);
+      owner_->SetOpener(nullptr);
+    }
   }
 
  private:
   FrameTreeNode* owner_;
+  bool observing_original_opener_;
 
   DISALLOW_COPY_AND_ASSIGN(OpenerDestroyedObserver);
 };
 
 int FrameTreeNode::next_frame_tree_node_id_ = 1;
 
 // static
 FrameTreeNode* FrameTreeNode::GloballyFindByID(int frame_tree_node_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   FrameTreeNodeIdMap* nodes = g_frame_tree_node_id_map.Pointer();
@@ skipping 14 matching lines @@
     : frame_tree_(frame_tree),
       navigator_(navigator),
       render_manager_(this,
                       render_frame_delegate,
                       render_widget_delegate,
                       manager_delegate),
       frame_tree_node_id_(next_frame_tree_node_id_++),
       parent_(parent),
       opener_(nullptr),
       opener_observer_(nullptr),
+      original_opener_(nullptr),
+      original_opener_observer_(nullptr),
       has_committed_real_load_(false),
       replication_state_(
           scope,
           name,
           unique_name,
           blink::WebSandboxFlags::None,
           false /* should enforce strict mixed content checking */,
           false /* is a potentially trustworthy unique origin */,
           false /* has received a user gesture */),
       pending_sandbox_flags_(blink::WebSandboxFlags::None),
@@ skipping 12 matching lines @@
 }
 
 FrameTreeNode::~FrameTreeNode() {
   std::vector<std::unique_ptr<FrameTreeNode>>().swap(children_);
   frame_tree_->FrameRemoved(this);
   for (auto& observer : observers_)
     observer.OnFrameTreeNodeDestroyed(this);
 
   if (opener_)
     opener_->RemoveObserver(opener_observer_.get());
+  if (original_opener_)
+    original_opener_->RemoveObserver(original_opener_observer_.get());
 
   g_frame_tree_node_id_map.Get().erase(frame_tree_node_id_);
 
   if (navigation_request_) {
     // PlzNavigate: if a frame with a pending navigation is detached, make sure
     // the WebContents (and its observers) update their loading state.
     navigation_request_.reset();
     DidStopLoading();
   }
 }
@@ skipping 61 matching lines @@
 void FrameTreeNode::SetOpener(FrameTreeNode* opener) {
   if (opener_) {
     opener_->RemoveObserver(opener_observer_.get());
     opener_observer_.reset();
   }
 
   opener_ = opener;
 
   if (opener_) {
     if (!opener_observer_)
-      opener_observer_ = base::MakeUnique<OpenerDestroyedObserver>(this);
+      opener_observer_ = base::MakeUnique<OpenerDestroyedObserver>(this, false);
     opener_->AddObserver(opener_observer_.get());
   }
 }
 
+void FrameTreeNode::SetOriginalOpener(FrameTreeNode* opener) {
+  DCHECK(!original_opener_ || !opener);
+
+  original_opener_ = opener;
+
+  if (original_opener_) {
+    DCHECK(!original_opener_observer_);
+    original_opener_observer_ =
+        base::MakeUnique<OpenerDestroyedObserver>(this, true);
+    original_opener_->AddObserver(original_opener_observer_.get());
+  }
+}
+
 void FrameTreeNode::SetCurrentURL(const GURL& url) {
   if (!has_committed_real_load_ && url != url::kAboutBlankURL)
     has_committed_real_load_ = true;
   current_frame_host()->set_last_committed_url(url);
   blame_context_.TakeSnapshot();
 }
 
 void FrameTreeNode::SetCurrentOrigin(
     const url::Origin& origin,
     bool is_potentially_trustworthy_unique_origin) {
@@ skipping 301 matching lines @@
       }
       return parent_->child_at(i + relative_offset);
     }
   }
 
   NOTREACHED() << "FrameTreeNode not found in its parent's children.";
   return nullptr;
 }
 
 }  // namespace content