From 9441435604e50c02109a578152399d20ee35a12d Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <krosylight@mozilla.com>
Date: Fri, 19 Mar 2021 12:36:57 +0000
Subject: [PATCH] Bug 1699332 - Remove remaining presentation URL references
 r=annevk

Differential Revision: https://phabricator.services.mozilla.com/D109010
---
 dom/base/nsContentUtils.cpp | 31 -------------------------------
 dom/base/nsContentUtils.h   |  7 -------
 dom/base/nsFrameLoader.cpp  | 18 +-----------------
 dom/ipc/BrowserChild.cpp    | 18 ------------------
 dom/ipc/BrowserChild.h      |  6 ------
 dom/ipc/PTabContext.ipdlh   |  5 -----
 dom/ipc/TabContext.cpp      | 13 ++-----------
 dom/ipc/TabContext.h        | 15 +--------------
 xpcom/ds/StaticAtoms.py     |  1 -
 9 files changed, 4 insertions(+), 110 deletions(-)

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index bbd0170eb1be..a5d51c1f6b63 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -9062,37 +9062,6 @@ void nsContentUtils::SetScrollbarsVisibility(nsIDocShell* aDocShell,
   nsDocShell::Cast(aDocShell)->SetScrollbarPreference(pref);
 }
 
-/* static */
-void nsContentUtils::GetPresentationURL(nsIDocShell* aDocShell,
-                                        nsAString& aPresentationUrl) {
-  MOZ_ASSERT(aDocShell);
-
-  if (XRE_IsContentProcess()) {
-    nsCOMPtr<nsIDocShellTreeItem> sameTypeRoot;
-    aDocShell->GetInProcessSameTypeRootTreeItem(getter_AddRefs(sameTypeRoot));
-    nsCOMPtr<nsIDocShellTreeItem> root;
-    aDocShell->GetInProcessRootTreeItem(getter_AddRefs(root));
-    if (sameTypeRoot.get() == root.get()) {
-      // presentation URL is stored in BrowserChild for the top most
-      // <iframe mozbrowser> in content process.
-      BrowserChild* browserChild = BrowserChild::GetFrom(aDocShell);
-      if (browserChild) {
-        aPresentationUrl = browserChild->PresentationURL();
-      }
-      return;
-    }
-  }
-
-  nsCOMPtr<nsILoadContext> loadContext(do_QueryInterface(aDocShell));
-  RefPtr<Element> topFrameElt;
-  loadContext->GetTopFrameElement(getter_AddRefs(topFrameElt));
-  if (!topFrameElt) {
-    return;
-  }
-
-  topFrameElt->GetAttr(nsGkAtoms::mozpresentation, aPresentationUrl);
-}
-
 /* static */
 nsIDocShell* nsContentUtils::GetDocShellForEventTarget(EventTarget* aTarget) {
   nsCOMPtr<nsPIDOMWindowInner> innerWindow;
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index a808741a1a51..4fe89763c102 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -2965,13 +2965,6 @@ class nsContentUtils {
 
   static void SetScrollbarsVisibility(nsIDocShell* aDocShell, bool aVisible);
 
-  /*
-   * Return the associated presentation URL of the presented content.
-   * Will return empty string if the docshell is not in a presented content.
-   */
-  static void GetPresentationURL(nsIDocShell* aDocShell,
-                                 nsAString& aPresentationUrl);
-
   /*
    * Try to find the docshell corresponding to the given event target.
    */
diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
index 539a9b26d3cb..643eb56fe9bb 100644
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -3016,18 +3016,6 @@ void nsFrameLoader::ApplySandboxFlags(uint32_t sandboxFlags) {
   // The child can only add restrictions, never remove them.
   sandboxFlags |= parentSandboxFlags;
 
-  // XXX this probably isn't fission compatible.
-  if (GetDocShell()) {
-    // If this frame is a receiving browsing context, we should add
-    // sandboxed auxiliary navigation flag to sandboxFlags. See
-    // https://w3c.github.io/presentation-api/#creating-a-receiving-browsing-context
-    nsAutoString presentationURL;
-    nsContentUtils::GetPresentationURL(GetDocShell(), presentationURL);
-    if (!presentationURL.IsEmpty()) {
-      sandboxFlags |= SANDBOXED_AUXILIARY_NAVIGATION;
-    }
-  }
-
   MOZ_ALWAYS_SUCCEEDS(context->SetSandboxFlags(sandboxFlags));
 }
 
@@ -3550,10 +3538,6 @@ void nsFrameLoader::MaybeUpdatePrimaryBrowserParent(
 
 nsresult nsFrameLoader::GetNewTabContext(MutableTabContext* aTabContext,
                                          nsIURI* aURI) {
-  nsAutoString presentationURLStr;
-  mOwnerContent->GetAttr(kNameSpaceID_None, nsGkAtoms::mozpresentation,
-                         presentationURLStr);
-
   nsCOMPtr<nsIDocShell> docShell = mOwnerContent->OwnerDoc()->GetDocShell();
   nsCOMPtr<nsILoadContext> parentContext = do_QueryInterface(docShell);
   NS_ENSURE_STATE(parentContext);
@@ -3580,7 +3564,7 @@ nsresult nsFrameLoader::GetNewTabContext(MutableTabContext* aTabContext,
   uint32_t maxTouchPoints = BrowserParent::GetMaxTouchPoints(mOwnerContent);
 
   bool tabContextUpdated = aTabContext->SetTabContext(
-      chromeOuterWindowID, showFocusRings, presentationURLStr, maxTouchPoints);
+      chromeOuterWindowID, showFocusRings, maxTouchPoints);
   NS_ENSURE_STATE(tabContextUpdated);
 
   return NS_OK;
diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
index ed6ad7fb12c4..c8e2e1f50318 100644
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
@@ -469,9 +469,6 @@ nsresult BrowserChild::Init(mozIDOMWindowProxy* aParent,
   mWebNav = do_QueryInterface(webBrowser);
   NS_ASSERTION(mWebNav, "nsWebBrowser doesn't implement nsIWebNavigation?");
 
-  // Set the tab context attributes then pass to docShell
-  NotifyTabContextUpdated();
-
   // IPC uses a WebBrowser object for which DNS prefetching is turned off
   // by default. But here we really want it, so enable it explicitly
   mWebBrowser->SetAllowDNSPrefetch(true);
@@ -560,21 +557,6 @@ nsresult BrowserChild::Init(mozIDOMWindowProxy* aParent,
   return NS_OK;
 }
 
-void BrowserChild::NotifyTabContextUpdated() {
-  nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation());
-  MOZ_ASSERT(docShell);
-
-  if (!docShell) {
-    return;
-  }
-
-  // Set SANDBOXED_AUXILIARY_NAVIGATION flag if this is a receiver page.
-  if (!PresentationURL().IsEmpty()) {
-    // Return value of setting synced field should be checked. See bug 1656492.
-    Unused << mBrowsingContext->SetSandboxFlags(SANDBOXED_AUXILIARY_NAVIGATION);
-  }
-}
-
 NS_IMPL_CYCLE_COLLECTION_CLASS(BrowserChild)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(BrowserChild)
diff --git a/dom/ipc/BrowserChild.h b/dom/ipc/BrowserChild.h
index 029d33ebe20d..b60efb515d17 100644
--- a/dom/ipc/BrowserChild.h
+++ b/dom/ipc/BrowserChild.h
@@ -741,12 +741,6 @@ class BrowserChild final : public nsMessageManagerScriptExecutor,
   void HandleDoubleTap(const CSSPoint& aPoint, const Modifiers& aModifiers,
                        const ScrollableLayerGuid& aGuid);
 
-  // Notify others that our TabContext has been updated.
-  //
-  // You should call this after calling TabContext::SetTabContext().  We also
-  // call this during Init().
-  void NotifyTabContextUpdated();
-
   void ActorDestroy(ActorDestroyReason why) override;
 
   bool InitBrowserChildMessageManager();
diff --git a/dom/ipc/PTabContext.ipdlh b/dom/ipc/PTabContext.ipdlh
index b83f87d26bf9..994d3293b602 100644
--- a/dom/ipc/PTabContext.ipdlh
+++ b/dom/ipc/PTabContext.ipdlh
@@ -27,11 +27,6 @@ struct FrameIPCTabContext
 {
   uint64_t chromeOuterWindowID;
 
-  // The requested presentation URL.
-  // This value would be empty if the TabContext isn't created for
-  // presented content.
-  nsString presentationURL;
-
   // Keyboard indicator state inherited from the parent.
   UIStateChangeType showFocusRings;
 
diff --git a/dom/ipc/TabContext.cpp b/dom/ipc/TabContext.cpp
index 2a1c8d9123ff..62db6998f3d0 100644
--- a/dom/ipc/TabContext.cpp
+++ b/dom/ipc/TabContext.cpp
@@ -51,21 +51,15 @@ bool TabContext::UpdateTabContextAfterSwap(const TabContext& aContext) {
   return true;
 }
 
-const nsAString& TabContext::PresentationURL() const {
-  return mPresentationURL;
-}
-
 UIStateChangeType TabContext::ShowFocusRings() const { return mShowFocusRings; }
 
 bool TabContext::SetTabContext(uint64_t aChromeOuterWindowID,
                                UIStateChangeType aShowFocusRings,
-                               const nsAString& aPresentationURL,
                                uint32_t aMaxTouchPoints) {
   NS_ENSURE_FALSE(mInitialized, false);
 
   mInitialized = true;
   mChromeOuterWindowID = aChromeOuterWindowID;
-  mPresentationURL = aPresentationURL;
   mShowFocusRings = aShowFocusRings;
   mMaxTouchPoints = aMaxTouchPoints;
   return true;
@@ -84,8 +78,7 @@ IPCTabContext TabContext::AsIPCTabContext() const {
     return IPCTabContext(JSPluginFrameIPCTabContext(mJSPluginID));
   }
 
-  return IPCTabContext(FrameIPCTabContext(mChromeOuterWindowID,
-                                          mPresentationURL, mShowFocusRings,
+  return IPCTabContext(FrameIPCTabContext(mChromeOuterWindowID, mShowFocusRings,
                                           mMaxTouchPoints));
 }
 
@@ -93,7 +86,6 @@ MaybeInvalidTabContext::MaybeInvalidTabContext(const IPCTabContext& aParams)
     : mInvalidReason(nullptr) {
   uint64_t chromeOuterWindowID = 0;
   int32_t jsPluginId = -1;
-  nsAutoString presentationURL;
   UIStateChangeType showFocusRings = UIStateChangeType_NoChange;
   uint32_t maxTouchPoints = 0;
 
@@ -115,7 +107,6 @@ MaybeInvalidTabContext::MaybeInvalidTabContext(const IPCTabContext& aParams)
       const FrameIPCTabContext& ipcContext = aParams.get_FrameIPCTabContext();
 
       chromeOuterWindowID = ipcContext.chromeOuterWindowID();
-      presentationURL = ipcContext.presentationURL();
       showFocusRings = ipcContext.showFocusRings();
       maxTouchPoints = ipcContext.maxTouchPoints();
       break;
@@ -130,7 +121,7 @@ MaybeInvalidTabContext::MaybeInvalidTabContext(const IPCTabContext& aParams)
     rv = mTabContext.SetTabContextForJSPluginFrame(jsPluginId);
   } else {
     rv = mTabContext.SetTabContext(chromeOuterWindowID, showFocusRings,
-                                   presentationURL, maxTouchPoints);
+                                   maxTouchPoints);
   }
   if (!rv) {
     mInvalidReason = "Couldn't initialize TabContext.";
diff --git a/dom/ipc/TabContext.h b/dom/ipc/TabContext.h
index a7ec44732150..19bccc81de50 100644
--- a/dom/ipc/TabContext.h
+++ b/dom/ipc/TabContext.h
@@ -44,12 +44,6 @@ class TabContext {
 
   uint64_t ChromeOuterWindowID() const;
 
-  /**
-   * Returns the presentation URL associated with the tab if this tab is
-   * created for presented content
-   */
-  const nsAString& PresentationURL() const;
-
   UIStateChangeType ShowFocusRings() const;
 
   uint32_t MaxTouchPoints() const { return mMaxTouchPoints; }
@@ -73,7 +67,6 @@ class TabContext {
 
   bool SetTabContext(uint64_t aChromeOuterWindowID,
                      UIStateChangeType aShowFocusRings,
-                     const nsAString& aPresentationURL,
                      uint32_t aMaxTouchPoints);
 
   /**
@@ -114,11 +107,6 @@ class TabContext {
 
   int32_t mJSPluginID;
 
-  /**
-   * The requested presentation URL.
-   */
-  nsString mPresentationURL;
-
   /**
    * Keyboard indicator state (focus rings).
    */
@@ -143,10 +131,9 @@ class MutableTabContext : public TabContext {
 
   bool SetTabContext(uint64_t aChromeOuterWindowID,
                      UIStateChangeType aShowFocusRings,
-                     const nsAString& aPresentationURL,
                      uint32_t aMaxTouchPoints) {
     return TabContext::SetTabContext(aChromeOuterWindowID, aShowFocusRings,
-                                     aPresentationURL, aMaxTouchPoints);
+                                     aMaxTouchPoints);
   }
 
   bool SetTabContextForJSPluginFrame(uint32_t aJSPluginID) {
diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
index 7b43906384ea..cc06e2f41102 100644
--- a/xpcom/ds/StaticAtoms.py
+++ b/xpcom/ds/StaticAtoms.py
@@ -997,7 +997,6 @@ STATIC_ATOMS = [
     Atom("prefersContrast", "prefers-contrast"),
     Atom("prefix", "prefix"),
     Atom("preload", "preload"),
-    Atom("mozpresentation", "mozpresentation"),
     Atom("preserve", "preserve"),
     Atom("preserveSpace", "preserve-space"),
     Atom("preventdefault", "preventdefault"),