Bug 1590762 - Part 2: Bump the id for channel registration to uint64_t. r=mattwoodrow,necko-reviewers,valentin

This patch also makes the identifier for channels global, in the sense
that the generated identifier is generated outside of and passed to
the nsIRedirectChannelRegistrar.

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

Author: farre

docshell/base/BrowsingContext.cpp

@@ -1585,7 +1585,7 @@ nsresult BrowsingContext::LoadURI(nsDocShellLoadState* aLoadState,
     if (ContentParent* cp = Canonical()->GetContentParent()) {
       // Attempt to initiate this load immediately in the parent, if it succeeds
       // it'll return a unique identifier so that we can find it later.
-      uint32_t loadIdentifier = 0;
+      uint64_t loadIdentifier = 0;
       if (Canonical()->AttemptLoadURIInParent(aLoadState, &loadIdentifier)) {
         aLoadState->SetLoadIdentifier(loadIdentifier);
       }

docshell/base/CanonicalBrowsingContext.cpp

@@ -813,7 +813,7 @@ MediaController* CanonicalBrowsingContext::GetMediaController() {
 }
 
 bool CanonicalBrowsingContext::AttemptLoadURIInParent(
-    nsDocShellLoadState* aLoadState, uint32_t* aLoadIdentifier) {
+    nsDocShellLoadState* aLoadState, uint64_t* aLoadIdentifier) {
   // We currently only support starting loads directly from the
   // CanonicalBrowsingContext for top-level BCs.
   if (!IsTopContent() || !GetContentParent() ||

docshell/base/CanonicalBrowsingContext.h

@@ -151,7 +151,7 @@ class CanonicalBrowsingContext final : public BrowsingContext {
   MediaController* GetMediaController();
 
   bool AttemptLoadURIInParent(nsDocShellLoadState* aLoadState,
-                              uint32_t* aLoadIdentifier);
+                              uint64_t* aLoadIdentifier);
 
   // Get or create a secure browser UI for this BrowsingContext
   nsISecureBrowserUI* GetSecureBrowserUI();

docshell/base/nsDocShellLoadState.h

@@ -238,8 +238,8 @@ class nsDocShellLoadState final {
     return mCancelContentJSEpoch;
   }
 
-  void SetLoadIdentifier(uint32_t aIdent) { mLoadIdentifier = aIdent; }
-  uint32_t GetLoadIdentifier() const { return mLoadIdentifier; }
+  void SetLoadIdentifier(uint64_t aIdent) { mLoadIdentifier = aIdent; }
+  uint64_t GetLoadIdentifier() const { return mLoadIdentifier; }
 
   // When loading a document through nsDocShell::LoadURI(), a special set of
   // flags needs to be set based on other values in nsDocShellLoadState. This
@@ -415,7 +415,7 @@ class nsDocShellLoadState final {
   // created in the parent process for this loads. DocumentChannels
   // created in the content process can use this to find and attach
   // to the in progress load.
-  uint32_t mLoadIdentifier;
+  uint64_t mLoadIdentifier;
 };
 
 #endif /* nsDocShellLoadState_h__ */

dom/base/nsContentUtils.cpp

@@ -9709,6 +9709,14 @@ uint64_t nsContentUtils::GenerateWindowId() {
   return GenerateProcessSpecificId(++gNextWindowId);
 }
 
+// Next process-local load.
+static Atomic<uint64_t> gNextLoadIdentifier(0);
+
+/* static */
+uint64_t nsContentUtils::GenerateLoadIdentifier() {
+  return GenerateProcessSpecificId(++gNextLoadIdentifier);
+}
+
 /* static */
 bool nsContentUtils::GetUserIsInteracting() {
   return UserInteractionObserver::sUserActive;

dom/base/nsContentUtils.h

@@ -3149,6 +3149,12 @@ class nsContentUtils {
    */
   static uint64_t GenerateWindowId();
 
+  /**
+   * Generate an ID for a load which is unique across processes and will never
+   * be recycled.
+   */
+  static uint64_t GenerateLoadIdentifier();
+
   /**
    * Determine whether or not the user is currently interacting with the web
    * browser. This method is safe to call from off of the main thread.

dom/ipc/ContentParent.cpp

@@ -4090,7 +4090,7 @@ mozilla::ipc::IPCResult ContentParent::RecvLoadURIExternal(
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvExtProtocolChannelConnectParent(
-    const uint32_t& registrarId) {
+    const uint64_t& registrarId) {
   nsresult rv;
 
   // First get the real channel created before redirect on the parent.

dom/ipc/ContentParent.h

@@ -1036,7 +1036,7 @@ class ContentParent final
       nsIURI* uri, nsIPrincipal* triggeringPrincipal,
       const MaybeDiscarded<BrowsingContext>& aContext);
   mozilla::ipc::IPCResult RecvExtProtocolChannelConnectParent(
-      const uint32_t& registrarId);
+      const uint64_t& registrarId);
 
   mozilla::ipc::IPCResult RecvSyncMessage(
       const nsString& aMsg, const ClonedMessageData& aData,

dom/ipc/DOMTypes.ipdlh

@@ -277,7 +277,7 @@ struct DocShellLoadStateInit
   // bool mIsSrcDocLoad; // useless without sourcedocshell
   // nsIChannel pendingRedirectedChannel; // sent through other mechanism
 
-  uint32_t LoadIdentifier;
+  uint64_t LoadIdentifier;
 };
 
 struct TimedChannelInfo

dom/ipc/PContent.ipdl

@@ -978,7 +978,7 @@ parent:
     async SetURITitle(nsIURI uri, nsString title);
 
     async LoadURIExternal(nsIURI uri, nsIPrincipal triggeringPrincipal, MaybeDiscardedBrowsingContext browsingContext);
-    async ExtProtocolChannelConnectParent(uint32_t registrarId);
+    async ExtProtocolChannelConnectParent(uint64_t registrarId);
 
     // PrefService message
     sync GetGfxVars() returns (GfxVarUpdate[] vars);