Bug 1616353 - Part 6.2: Remove setOriginAttributesBeforeLoading API, r=smaug

This API is no longer possible to implement, as it will always try to set the
OriginAttributes on a content BrowsingContext after it has been attached, and JS
can never observe a detached BrowsingContext.

Users of this API are instead changed to perform assertions that
originAttributes have already been set correctly.

Differential Revision: https://phabricator.services.mozilla.com/D67046

browser/base/content/browser.js

@@ -1489,6 +1489,10 @@ function _loadURI(browser, uri, params = {}) {
     throw new Error("Must load with a triggering Principal");
   }
 
+  if (userContextId && userContextId != browser.getAttribute("usercontextid")) {
+    throw new Error("Cannot load with mismatched userContextId");
+  }
+
   let {
     uriObject,
     requiredRemoteType,
@@ -1524,14 +1528,6 @@ function _loadURI(browser, uri, params = {}) {
   };
   try {
     if (!mustChangeProcess) {
-      if (userContextId) {
-        browser.webNavigation.setOriginAttributesBeforeLoading({
-          userContextId,
-          privateBrowsingId: PrivateBrowsingUtils.isBrowserPrivate(browser)
-            ? 1
-            : 0,
-        });
-      }
       browser.webNavigation.loadURI(uri, loadURIOptions);
     } else {
       // Check if the current browser is allowed to unload.
@@ -1580,14 +1576,6 @@ function _loadURI(browser, uri, params = {}) {
       Cu.reportError(e);
       gBrowser.updateBrowserRemotenessByURL(browser, uri);
 
-      if (userContextId) {
-        browser.webNavigation.setOriginAttributesBeforeLoading({
-          userContextId,
-          privateBrowsingId: PrivateBrowsingUtils.isBrowserPrivate(browser)
-            ? 1
-            : 0,
-        });
-      }
       browser.webNavigation.loadURI(uri, loadURIOptions);
     } else {
       throw e;

browser/components/sessionstore/ContentRestore.jsm

@@ -292,11 +292,6 @@ ContentRestoreInternal.prototype = {
           ? E10SUtils.deserializeCSP(loadArguments.csp)
           : null;
 
-        if (loadArguments.userContextId) {
-          webNavigation.setOriginAttributesBeforeLoading({
-            userContextId: loadArguments.userContextId,
-          });
-        }
         let loadURIOptions = {
           triggeringPrincipal,
           loadFlags: loadArguments.flags,

browser/components/sessionstore/SessionStore.jsm

@@ -5058,9 +5058,6 @@ var SessionStoreInternal = {
     let uri = activePageData ? activePageData.url || null : null;
     if (loadArguments) {
       uri = loadArguments.uri;
-      if (loadArguments.userContextId) {
-        browser.setAttribute("usercontextid", loadArguments.userContextId);
-      }
     }
 
     this.markTabAsRestoring(aTab);

devtools/client/responsive/browser/web-navigation.js

@@ -84,13 +84,6 @@ BrowserElementWebNavigation.prototype = {
     });
   },
 
-  setOriginAttributesBeforeLoading(originAttributes) {
-    // No equivalent in the current BrowserElement API
-    this._sendMessage("WebNavigation:SetOriginAttributes", {
-      originAttributes,
-    });
-  },
-
   reload(flags) {
     let hardReload = false;
     if (

docshell/base/nsDocShell.cpp

@@ -12546,21 +12546,6 @@ nsresult nsDocShell::SetOriginAttributes(const OriginAttributes& aAttrs) {
   return mBrowsingContext->SetOriginAttributes(aAttrs);
 }
 
-NS_IMETHODIMP
-nsDocShell::SetOriginAttributesBeforeLoading(
-    JS::Handle<JS::Value> aOriginAttributes, JSContext* aCx) {
-  if (!aOriginAttributes.isObject()) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  OriginAttributes attrs;
-  if (!attrs.Init(aCx, aOriginAttributes)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  return SetOriginAttributes(attrs);
-}
-
 NS_IMETHODIMP
 nsDocShell::ResumeRedirectedLoad(uint64_t aIdentifier, int32_t aHistoryIndex) {
   RefPtr<nsDocShell> self = this;

docshell/base/nsIWebNavigation.idl

@@ -344,13 +344,6 @@ interface nsIWebNavigation : nsISupports
   }
   %}
 
-  /**
-   * Set an OriginAttributes dictionary in the docShell. This can be done only
-   * before loading any content.
-   */
-  [implicit_jscontext]
-  void setOriginAttributesBeforeLoading(in jsval originAttributes);
-
   /**
    * Resume a load which has been redirected from another process.
    *

toolkit/actors/WebNavigationChild.jsm

@@ -22,9 +22,6 @@ class WebNavigationChild extends JSWindowActorChild {
       case "WebNavigation:GotoIndex":
         this.gotoIndex(message.data);
         break;
-      case "WebNavigation:SetOriginAttributes":
-        this.setOriginAttributes(message.data.originAttributes);
-        break;
       case "WebNavigation:Reload":
         this.reload(message.data.loadFlags);
         break;
@@ -79,12 +76,6 @@ class WebNavigationChild extends JSWindowActorChild {
     }
   }
 
-  setOriginAttributes(originAttributes) {
-    if (originAttributes) {
-      this.webNavigation.setOriginAttributesBeforeLoading(originAttributes);
-    }
-  }
-
   reload(loadFlags) {
     this.webNavigation.reload(loadFlags);
   }

toolkit/components/browser/nsWebBrowser.cpp

@@ -527,13 +527,6 @@ nsWebBrowser::LoadURIFromScript(const nsAString& aURI,
   return LoadURI(aURI, loadURIOptions);
 }
 
-NS_IMETHODIMP
-nsWebBrowser::SetOriginAttributesBeforeLoading(
-    JS::Handle<JS::Value> aOriginAttributes, JSContext* aCx) {
-  return mDocShellAsNav->SetOriginAttributesBeforeLoading(aOriginAttributes,
-                                                          aCx);
-}
-
 NS_IMETHODIMP
 nsWebBrowser::ResumeRedirectedLoad(uint64_t aIdentifier,
                                    int32_t aHistoryIndex) {

toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm

@@ -111,11 +111,6 @@ class RemoteWebNavigation {
       cancelContentJSEpoch,
     });
   }
-  setOriginAttributesBeforeLoading(aOriginAttributes) {
-    this._sendMessage("WebNavigation:SetOriginAttributes", {
-      originAttributes: aOriginAttributes,
-    });
-  }
   reload(aReloadFlags) {
     this._sendMessage("WebNavigation:Reload", { loadFlags: aReloadFlags });
   }