Bug 1489257 - Backed out 3 changesets (bug 1441059, bug 1478171) for causing bug 1489257. r=me

Backed out changeset f7bd4f224f9a (bug 1441059)
Backed out changeset e66e6bd82e3f (bug 1441059)
Backed out changeset 94cfd6113ca7 (bug 1478171)

docshell/base/nsDocShell.cpp

@@ -9055,33 +9055,30 @@ nsDocShell::CopyFavicon(nsIURI* aOldURI,
 #endif
 }
 
-struct InternalLoadData
+class InternalLoadEvent : public Runnable
 {
 public:
-  InternalLoadData(nsDocShell* aDocShell,
-                   nsIURI* aURI,
-                   nsIURI* aOriginalURI,
-                   Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
-                   bool aKeepResultPrincipalURIIfSet,
-                   bool aLoadReplace,
-                   nsIURI* aReferrer, uint32_t aReferrerPolicy,
-                   nsIPrincipal* aTriggeringPrincipal,
-                   nsIPrincipal* aPrincipalToInherit,
-                   uint32_t aFlags,
-                   const nsAString& aWindowTarget,
-                   const char* aTypeHint,
-                   const nsAString& aFileName,
-                   nsIInputStream* aPostData,
-                   nsIInputStream* aHeadersData,
-                   uint32_t aLoadType,
-                   nsISHEntry* aSHEntry,
-                   bool aFirstParty,
-                   const nsAString& aSrcdoc,
-                   nsIDocShell* aSourceDocShell,
-                   nsIURI* aBaseURI,
-                   nsIDocShell** aDocShell2,
-                   nsIRequest** aRequest)
-    : mSrcdoc(aSrcdoc)
+  InternalLoadEvent(nsDocShell* aDocShell,
+                    nsIURI* aURI,
+                    nsIURI* aOriginalURI,
+                    Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
+                    bool aKeepResultPrincipalURIIfSet,
+                    bool aLoadReplace,
+                    nsIURI* aReferrer, uint32_t aReferrerPolicy,
+                    nsIPrincipal* aTriggeringPrincipal,
+                    nsIPrincipal* aPrincipalToInherit,
+                    uint32_t aFlags,
+                    const char* aTypeHint,
+                    nsIInputStream* aPostData,
+                    nsIInputStream* aHeadersData,
+                    uint32_t aLoadType,
+                    nsISHEntry* aSHEntry,
+                    bool aFirstParty,
+                    const nsAString& aSrcdoc,
+                    nsIDocShell* aSourceDocShell,
+                    nsIURI* aBaseURI)
+    : mozilla::Runnable("InternalLoadEvent")
+    , mSrcdoc(aSrcdoc)
     , mDocShell(aDocShell)
     , mURI(aURI)
     , mOriginalURI(aOriginalURI)
@@ -9096,14 +9093,10 @@ public:
     , mHeadersData(aHeadersData)
     , mSHEntry(aSHEntry)
     , mFlags(aFlags)
-    , mWindowTarget(aWindowTarget)
-    , mFileName(aFileName)
     , mLoadType(aLoadType)
     , mFirstParty(aFirstParty)
     , mSourceDocShell(aSourceDocShell)
     , mBaseURI(aBaseURI)
-    , mDocShell2(aDocShell2)
-    , mRequest(aRequest)
   {
     // Make sure to keep null things null as needed
     if (aTypeHint) {
@@ -9113,7 +9106,8 @@ public:
     }
   }
 
-  nsresult Run()
+  NS_IMETHOD
+  Run() override
   {
     return mDocShell->InternalLoad(mURI, mOriginalURI, mResultPrincipalURI,
                                    mKeepResultPrincipalURIIfSet,
@@ -9121,16 +9115,17 @@ public:
                                    mReferrer,
                                    mReferrerPolicy,
                                    mTriggeringPrincipal, mPrincipalToInherit,
-                                   mFlags, mWindowTarget,
+                                   mFlags, EmptyString(),
                                    mTypeHint.IsVoid() ? nullptr
                                                       : mTypeHint.get(),
-                                   mFileName, mPostData,
+                                   VoidString(), mPostData,
                                    mHeadersData, mLoadType, mSHEntry,
                                    mFirstParty, mSrcdoc, mSourceDocShell,
-                                   mBaseURI, mDocShell2,
-                                   mRequest);
+                                   mBaseURI, nullptr,
+                                   nullptr);
   }
 
+private:
   nsCString mTypeHint;
   nsString mSrcdoc;
 
@@ -9148,174 +9143,12 @@ public:
   nsCOMPtr<nsIInputStream> mHeadersData;
   nsCOMPtr<nsISHEntry> mSHEntry;
   uint32_t mFlags;
-  nsString mWindowTarget;
-  nsString mFileName;
   uint32_t mLoadType;
   bool mFirstParty;
   nsCOMPtr<nsIDocShell> mSourceDocShell;
   nsCOMPtr<nsIURI> mBaseURI;
-  nsIDocShell** mDocShell2;
-  nsIRequest** mRequest;
 };
 
-class InternalLoadEvent : public Runnable
-{
-public:
-  InternalLoadEvent(nsDocShell* aDocShell,
-                    nsIURI* aURI,
-                    nsIURI* aOriginalURI,
-                    Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
-                    bool aKeepResultPrincipalURIIfSet,
-                    bool aLoadReplace,
-                    nsIURI* aReferrer,
-                    uint32_t aReferrerPolicy,
-                    nsIPrincipal* aTriggeringPrincipal,
-                    nsIPrincipal* aPrincipalToInherit,
-                    uint32_t aFlags,
-                    const char* aTypeHint,
-                    nsIInputStream* aPostData,
-                    nsIInputStream* aHeadersData,
-                    uint32_t aLoadType,
-                    nsISHEntry* aSHEntry,
-                    bool aFirstParty,
-                    const nsAString& aSrcdoc,
-                    nsIDocShell* aSourceDocShell,
-                    nsIURI* aBaseURI)
-    : mozilla::Runnable("InternalLoadEvent")
-    , mLoadData(aDocShell,
-                aURI,
-                aOriginalURI,
-                aResultPrincipalURI,
-                aKeepResultPrincipalURIIfSet,
-                aLoadReplace,
-                aReferrer,
-                aReferrerPolicy,
-                aTriggeringPrincipal,
-                aPrincipalToInherit,
-                aFlags,
-                EmptyString(),
-                aTypeHint,
-                VoidString(),
-                aPostData,
-                aHeadersData,
-                aLoadType,
-                aSHEntry,
-                aFirstParty,
-                aSrcdoc,
-                aSourceDocShell,
-                aBaseURI,
-                nullptr,
-                nullptr)
-  {}
-
-  NS_IMETHOD
-  Run() override
-  {
-    return mLoadData.Run();
-  }
-
-private:
-  InternalLoadData mLoadData;
-};
-
-class LoadURIDelegateHandler final : public PromiseNativeHandler
-{
-public:
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS(LoadURIDelegateHandler)
-
-  LoadURIDelegateHandler(nsDocShell* aDocShell,
-                         nsIURI* aURI,
-                         nsIURI* aOriginalURI,
-                         Maybe<nsCOMPtr<nsIURI>> const& aResultPrincipalURI,
-                         bool aKeepResultPrincipalURIIfSet,
-                         bool aLoadReplace,
-                         nsIURI* aReferrer,
-                         uint32_t aReferrerPolicy,
-                         nsIPrincipal* aTriggeringPrincipal,
-                         nsIPrincipal* aPrincipalToInherit,
-                         uint32_t aFlags,
-                         const nsAString& aWindowTarget,
-                         const char* aTypeHint,
-                         const nsAString& aFileName,
-                         nsIInputStream* aPostData,
-                         nsIInputStream* aHeadersData,
-                         uint32_t aLoadType,
-                         nsISHEntry* aSHEntry,
-                         bool aFirstParty,
-                         const nsAString& aSrcdoc,
-                         nsIDocShell* aSourceDocShell,
-                         nsIURI* aBaseURI,
-                         nsIDocShell** aDocShell2,
-                         nsIRequest** aRequest)
-    : mLoadData(aDocShell,
-                aURI,
-                aOriginalURI,
-                aResultPrincipalURI,
-                aKeepResultPrincipalURIIfSet,
-                aLoadReplace,
-                aReferrer,
-                aReferrerPolicy,
-                aTriggeringPrincipal,
-                aPrincipalToInherit,
-                aFlags,
-                aWindowTarget,
-                aTypeHint,
-                aFileName,
-                aPostData,
-                aHeadersData,
-                aLoadType,
-                aSHEntry,
-                aFirstParty,
-                aSrcdoc,
-                aSourceDocShell,
-                aBaseURI,
-                aDocShell2,
-                aRequest)
-  {}
-
-  void
-  ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) override
-  {
-    if (aValue.isBoolean() && !aValue.toBoolean()) {
-      // Things went fine, not handled by app, let Gecko do its thing
-      mLoadData.Run();
-    } else if (!aValue.isBoolean()) {
-      // If the promise resolves to a non-boolean, let Gecko handle the load
-      mLoadData.Run();
-    }
-  }
-
-  void
-  RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) override
-  {
-    // In the event of a rejected callback, let Gecko handle the load
-    mLoadData.Run();
-  }
-
-private:
-  ~LoadURIDelegateHandler()
-  {}
-
-  InternalLoadData mLoadData;
-};
-
-NS_IMPL_CYCLE_COLLECTION(LoadURIDelegateHandler, mLoadData.mDocShell,
-                         mLoadData.mURI, mLoadData.mOriginalURI,
-                         mLoadData.mResultPrincipalURI, mLoadData.mReferrer,
-                         mLoadData.mTriggeringPrincipal,
-                         mLoadData.mPrincipalToInherit,
-                         mLoadData.mPostData, mLoadData.mHeadersData,
-                         mLoadData.mSHEntry, mLoadData.mSourceDocShell,
-                         mLoadData.mBaseURI)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(LoadURIDelegateHandler)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(LoadURIDelegateHandler)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(LoadURIDelegateHandler)
-
 /**
  * Returns true if we started an asynchronous load (i.e., from the network), but
  * the document we're loading there hasn't yet become this docshell's active
@@ -9563,10 +9396,7 @@ nsDocShell::InternalLoad(nsIURI* aURI,
   const bool isDocumentAuxSandboxed = doc &&
     (doc->GetSandboxFlags() & SANDBOXED_AUXILIARY_NAVIGATION);
 
-  const bool checkLoadDelegates = !(aFlags & INTERNAL_LOAD_FLAGS_DELEGATES_CHECKED);
-  aFlags = aFlags & ~INTERNAL_LOAD_FLAGS_DELEGATES_CHECKED;
-
-  if (aURI && mLoadURIDelegate && checkLoadDelegates && aLoadType != LOAD_ERROR_PAGE &&
+  if (aURI && mLoadURIDelegate && aLoadType != LOAD_ERROR_PAGE &&
       (!targetDocShell || targetDocShell == static_cast<nsIDocShell*>(this))) {
     // Dispatch only load requests for the current or a new window to the
     // delegate, e.g., to allow for GeckoView apps to handle the load event
@@ -9579,24 +9409,11 @@ nsDocShell::InternalLoad(nsIURI* aURI,
       return NS_ERROR_DOM_INVALID_ACCESS_ERR;
     }
 
-    RefPtr<dom::Promise> promise;
+    bool loadURIHandled = false;
     rv = mLoadURIDelegate->LoadURI(aURI, where, aFlags, aTriggeringPrincipal,
-                                   getter_AddRefs(promise));
-    if (NS_SUCCEEDED(rv) && promise) {
-      const uint32_t flags = aFlags | INTERNAL_LOAD_FLAGS_DELEGATES_CHECKED;
-
-      RefPtr<LoadURIDelegateHandler> handler =
-        new LoadURIDelegateHandler(this, aURI, aOriginalURI, aResultPrincipalURI,
-                                   aKeepResultPrincipalURIIfSet,
-                                   aLoadReplace, aReferrer, aReferrerPolicy,
-                                   aTriggeringPrincipal, aPrincipalToInherit,
-                                   flags, aWindowTarget, aTypeHint, aFileName, aPostData,
-                                   aHeadersData, aLoadType, aSHEntry, aFirstParty,
-                                   aSrcdoc, aSourceDocShell, aBaseURI, nullptr, nullptr);
-
-      promise->AppendNativeHandler(handler);
-
-      // Checking for load delegates; InternalLoad will be re-called if needed.
+                                   &loadURIHandled);
+    if (NS_SUCCEEDED(rv) && loadURIHandled) {
+      // The request has been handled, nothing to do here.
       return NS_OK;
     }
   }