Bug 1656753 - Track CrossGroupOpener on CanonicalBrowsingContext, r=f…

…arre Differential Revision: https://phabricator.services.mozilla.com/D90890
iaxat · Sep 22, 2020 · ac1e373 · ac1e373
1 parent 4d4ac26
commit ac1e373
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
@@ -1461,6 +1461,13 @@ void CanonicalBrowsingContext::HistoryCommitIndexAndLength(
   });
 }
 
+void CanonicalBrowsingContext::SetCrossGroupOpenerId(uint64_t aOpenerId) {
+  MOZ_DIAGNOSTIC_ASSERT(IsTopContent());
+  MOZ_DIAGNOSTIC_ASSERT(mCrossGroupOpenerId == 0,
+                        "Can only set CrossGroupOpenerId once");
+  mCrossGroupOpenerId = aOpenerId;
+}
+
 NS_IMPL_CYCLE_COLLECTION_INHERITED(CanonicalBrowsingContext, BrowsingContext,
                                    mSessionHistory)
 

diff --git a/docshell/base/CanonicalBrowsingContext.h b/docshell/base/CanonicalBrowsingContext.h
@@ -71,6 +71,13 @@ class CanonicalBrowsingContext final : public BrowsingContext {
   void ClearInFlightProcessId(uint64_t aProcessId);
   uint64_t GetInFlightProcessId() const { return mInFlightProcessId; }
 
+  // The ID of the BrowsingContext which caused this BrowsingContext to be
+  // opened, or `0` if this is unknown.
+  // Only set for toplevel content BrowsingContexts, and may be from a different
+  // BrowsingContextGroup.
+  uint64_t GetCrossGroupOpenerId() const { return mCrossGroupOpenerId; }
+  void SetCrossGroupOpenerId(uint64_t aOpenerId);
+
   void GetWindowGlobals(nsTArray<RefPtr<WindowGlobalParent>>& aWindows);
 
   // The current active WindowGlobal.
@@ -301,6 +308,8 @@ class CanonicalBrowsingContext final : public BrowsingContext {
   // have in-flight messages that assume it is still the owner.
   uint64_t mInFlightProcessId = 0;
 
+  uint64_t mCrossGroupOpenerId = 0;
+
   // The current remoteness change which is in a pending state.
   RefPtr<PendingRemotenessChange> mPendingRemotenessChange;
 

diff --git a/docshell/base/nsDSURIContentListener.cpp b/docshell/base/nsDSURIContentListener.cpp
@@ -72,24 +72,20 @@ BrowsingContext* MaybeCloseWindowHelper::MaybeCloseWindow() {
 
 already_AddRefed<BrowsingContext>
 MaybeCloseWindowHelper::ChooseNewBrowsingContext(BrowsingContext* aBC) {
-  RefPtr<BrowsingContext> bc = aBC;
-
-  RefPtr<BrowsingContext> opener = bc->GetOpener();
+  RefPtr<BrowsingContext> opener = aBC->GetOpener();
   if (opener && !opener->IsDiscarded()) {
     return opener.forget();
   }
 
   if (!XRE_IsParentProcess()) {
-    return bc.forget();
+    return nullptr;
   }
 
-  CanonicalBrowsingContext* cbc = CanonicalBrowsingContext::Cast(aBC);
-  RefPtr<WindowGlobalParent> wgp = cbc->GetEmbedderWindowGlobal();
-  if (!wgp) {
-    return bc.forget();
+  opener = BrowsingContext::Get(aBC->Canonical()->GetCrossGroupOpenerId());
+  if (!opener || opener->IsDiscarded()) {
+    return nullptr;
   }
-
-  return do_AddRef(wgp->BrowsingContext());
+  return opener.forget();
 }
 
 NS_IMETHODIMP

diff --git a/docshell/base/nsDSURIContentListener.h b/docshell/base/nsDSURIContentListener.h
@@ -30,9 +30,9 @@ class MaybeCloseWindowHelper final : public nsITimerCallback {
    * Closes the provided window async (if mShouldCloseWindow is true) and
    * returns a valid browsingContext to be used instead as parent for dialogs or
    * similar things.
-   * In case mShouldCloseWindow is true, the final browsing context will be the
-   * a valid new chrome window to use. It can be the opener, or the opener's
-   * top, or the top chrome window.
+   * In case mShouldCloseWindow is true, the returned BrowsingContext will be
+   * the window's opener (or original cross-group opener in the case of a
+   * `noopener` popup).
    */
   mozilla::dom::BrowsingContext* MaybeCloseWindow();
 

diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
@@ -414,6 +414,14 @@ already_AddRefed<nsFrameLoader> nsFrameLoader::Create(
       CreateBrowsingContext(aOwner, aOpenWindowInfo, group, aNetworkCreated);
   NS_ENSURE_TRUE(context, nullptr);
 
+  if (XRE_IsParentProcess() && aOpenWindowInfo) {
+    MOZ_ASSERT(context->IsTopContent());
+    if (RefPtr<BrowsingContext> crossGroupOpener =
+            aOpenWindowInfo->GetParent()) {
+      context->Canonical()->SetCrossGroupOpenerId(crossGroupOpener->Id());
+    }
+  }
+
   bool isRemoteFrame = InitialLoadIsRemote(aOwner);
   RefPtr<nsFrameLoader> fl =
       new nsFrameLoader(aOwner, context, isRemoteFrame, aNetworkCreated);