Revert "Bug 1991265 - Make push to replace load conversion follow spec. r=smaug" for causing wpt failures.

This reverts commit 91a14bd.

Author: sstanca-cell

docshell/base/BrowsingContext.cpp

@@ -2127,7 +2127,6 @@ nsresult BrowsingContext::LoadURI(nsDocShellLoadState* aLoadState,
 
   if (mDocShell) {
     nsCOMPtr<nsIDocShell> docShell = mDocShell;
-
     return docShell->LoadURI(aLoadState, aSetNavigating);
   }
 
@@ -2438,7 +2437,7 @@ BrowsingContext::CheckURLAndCreateLoadState(nsIURI* aURI,
 void BrowsingContext::Navigate(nsIURI* aURI, nsIPrincipal& aSubjectPrincipal,
                                ErrorResult& aRv,
                                NavigationHistoryBehavior aHistoryHandling,
-                               bool aNeedsCompletelyLoadedDocument) {
+                               bool aShouldNotForceReplaceInOnLoad) {
   MOZ_LOG_FMT(gNavigationAPILog, LogLevel::Debug, "Navigate to {} as {}", *aURI,
               aHistoryHandling);
   CallerType callerType = aSubjectPrincipal.IsSystemPrincipal()
@@ -2457,16 +2456,27 @@ void BrowsingContext::Navigate(nsIURI* aURI, nsIPrincipal& aSubjectPrincipal,
     return;
   }
 
-  if (mozilla::SessionHistoryInParent()) {
-    loadState->SetNeedsCompletelyLoadedDocument(aNeedsCompletelyLoadedDocument);
-
-    loadState->SetShouldNotForceReplaceInOnLoad(
-        /* aShouldNotForceReplaceInOnLoad */ true);
+  loadState->SetShouldNotForceReplaceInOnLoad(aShouldNotForceReplaceInOnLoad);
 
-    loadState->SetHistoryBehavior(aHistoryHandling);
+  // Step 12
+  NavigationHistoryBehavior historyHandling = aHistoryHandling;
+  if (aHistoryHandling == NavigationHistoryBehavior::Auto) {
+    if (auto* document = GetExtantDocument()) {
+      bool equals = false;
+      aURI->Equals(document->GetDocumentURI(), &equals);
+      if (equals && document->GetPrincipal()) {
+        document->GetPrincipal()->Equals(&aSubjectPrincipal, &equals);
+      }
+      if (equals) {
+        historyHandling = NavigationHistoryBehavior::Replace;
+      } else {
+        historyHandling = NavigationHistoryBehavior::Push;
+      }
+    }
   }
 
-  if (aHistoryHandling == NavigationHistoryBehavior::Replace) {
+  // Step 13 of #navigate are handled later in nsDocShell::InternalLoad().
+  if (historyHandling == NavigationHistoryBehavior::Replace) {
     loadState->SetLoadType(LOAD_STOP_CONTENT_AND_REPLACE);
   } else {
     loadState->SetLoadType(LOAD_STOP_CONTENT);

docshell/base/BrowsingContext.h

@@ -459,7 +459,7 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
   void Navigate(nsIURI* aURI, nsIPrincipal& aSubjectPrincipal, ErrorResult& aRv,
                 NavigationHistoryBehavior aHistoryHandling =
                     NavigationHistoryBehavior::Auto,
-                bool aNeedsCompletelyLoadedDocument = false);
+                bool aShouldNotForceReplaceInOnLoad = false);
 
   // Removes the root document for this BrowsingContext tree from the BFCache,
   // if it is cached, and returns true if it was.

docshell/base/nsDocShell.cpp

@@ -72,7 +72,6 @@
 #include "mozilla/dom/Navigation.h"
 #include "mozilla/dom/NavigationBinding.h"
 #include "mozilla/dom/NavigationHistoryEntry.h"
-#include "mozilla/dom/NavigationUtils.h"
 #include "mozilla/dom/PerformanceNavigation.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/PolicyContainer.h"
@@ -8730,7 +8729,6 @@ struct SameDocumentNavigationState {
   bool mSameExceptHashes = false;
   bool mSecureUpgradeURI = false;
   bool mHistoryNavBetweenSameDoc = false;
-  bool mIdentical = false;
 };
 
 bool nsDocShell::IsSameDocumentNavigation(nsDocShellLoadState* aLoadState,
@@ -8836,12 +8834,6 @@ bool nsDocShell::IsSameDocumentNavigation(nsDocShellLoadState* aLoadState,
     }
   }
 
-  // Two URIs are identical if they're same except hashes, they both have
-  // hashes, and their hashes are the same.
-  aState.mIdentical = aState.mSameExceptHashes &&
-                      (aState.mNewURIHasRef == aState.mCurrentURIHasRef) &&
-                      aState.mCurrentHash.Equals(aState.mNewHash);
-
   // A same document navigation happens when we navigate between two SHEntries
   // for the same document. We do a same document navigation under two
   // circumstances. Either
@@ -9389,8 +9381,10 @@ nsresult nsDocShell::HandleSameDocumentNavigation(
       // https://html.spec.whatwg.org/multipage/browsing-the-web.html#updating-the-document
       navigation->UpdateEntriesForSameDocumentNavigation(
           mActiveEntry.get(),
-          NavigationUtils::NavigationTypeFromLoadType(mLoadType).valueOr(
-              NavigationType::Push));
+          LOAD_TYPE_HAS_FLAGS(mLoadType, LOAD_FLAGS_REPLACE_HISTORY)
+              ? NavigationType::Replace
+          : aLoadState->LoadIsFromSessionHistory() ? NavigationType::Traverse
+                                                   : NavigationType::Push);
     }
 
     // Fire a hashchange event URIs differ, and only in their hashes.
@@ -9471,34 +9465,6 @@ uint32_t nsDocShell::GetLoadTypeForFormSubmission(
              : LOAD_LINK;
 }
 
-static void MaybeConvertToReplaceLoad(nsDocShellLoadState* aLoadState,
-                                      Document* aExtantDocument,
-                                      bool aIdenticalURI) {
-  if (!aExtantDocument || !mozilla::SessionHistoryInParent()) {
-    return;
-  }
-
-  bool convertToReplaceLoad = aLoadState->NeedsCompletelyLoadedDocument() &&
-                              !aExtantDocument->IsCompletelyLoaded();
-  if (const auto& historyBehavior = aLoadState->HistoryBehavior();
-      !convertToReplaceLoad && historyBehavior &&
-      *historyBehavior == NavigationHistoryBehavior::Auto) {
-    convertToReplaceLoad = aIdenticalURI;
-    if (convertToReplaceLoad && aExtantDocument->GetPrincipal()) {
-      aExtantDocument->GetPrincipal()->Equals(aLoadState->TriggeringPrincipal(),
-                                              &convertToReplaceLoad);
-    }
-  }
-
-  if (convertToReplaceLoad) {
-    MOZ_LOG_FMT(gNavigationAPILog, LogLevel::Debug,
-                "Convert to replace when navigating from {} to {}",
-                *aExtantDocument->GetDocumentURI(), *aLoadState->URI());
-    aLoadState->SetLoadType(MaybeAddLoadFlags(
-        aLoadState->LoadType(), nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY));
-  }
-}
-
 // InternalLoad performs several of the steps from
 // https://html.spec.whatwg.org/#navigate.
 nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
@@ -9559,11 +9525,6 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
       IsSameDocumentNavigation(aLoadState, sameDocumentNavigationState) &&
       !aLoadState->GetPendingRedirectedChannel();
 
-  if (mLoadType != LOAD_ERROR_PAGE) {
-    MaybeConvertToReplaceLoad(aLoadState, GetExtantDocument(),
-                              sameDocumentNavigationState.mIdentical);
-  }
-
   // Note: We do this check both here and in BrowsingContext::
   // LoadURI/InternalLoad, since document-specific sandbox flags are only
   // available in the process triggering the load, and we don't want the target

docshell/base/nsDocShellLoadState.cpp

@@ -71,9 +71,6 @@ nsDocShellLoadState::nsDocShellLoadState(
   mOriginalFrameSrc = aLoadState.OriginalFrameSrc();
   mShouldCheckForRecursion = aLoadState.ShouldCheckForRecursion();
   mIsFormSubmission = aLoadState.IsFormSubmission();
-  mShouldNotForceReplaceInOnLoad = aLoadState.ShouldNotForceReplaceInOnLoad();
-  mNeedsCompletelyLoadedDocument = aLoadState.NeedsCompletelyLoadedDocument();
-  mHistoryBehavior = aLoadState.HistoryBehavior();
   mLoadType = aLoadState.LoadType();
   mTarget = aLoadState.Target();
   mTargetBrowsingContext = aLoadState.TargetBrowsingContext();
@@ -175,6 +172,7 @@ nsDocShellLoadState::nsDocShellLoadState(const nsDocShellLoadState& aOther)
       mInheritPrincipal(aOther.mInheritPrincipal),
       mPrincipalIsExplicit(aOther.mPrincipalIsExplicit),
       mNotifiedBeforeUnloadListeners(aOther.mNotifiedBeforeUnloadListeners),
+      mShouldNotForceReplaceInOnLoad(aOther.mShouldNotForceReplaceInOnLoad),
       mPrincipalToInherit(aOther.mPrincipalToInherit),
       mPartitionedPrincipalToInherit(aOther.mPartitionedPrincipalToInherit),
       mForceAllowDataURI(aOther.mForceAllowDataURI),
@@ -183,9 +181,6 @@ nsDocShellLoadState::nsDocShellLoadState(const nsDocShellLoadState& aOther)
       mOriginalFrameSrc(aOther.mOriginalFrameSrc),
       mShouldCheckForRecursion(aOther.mShouldCheckForRecursion),
       mIsFormSubmission(aOther.mIsFormSubmission),
-      mShouldNotForceReplaceInOnLoad(aOther.mShouldNotForceReplaceInOnLoad),
-      mNeedsCompletelyLoadedDocument(aOther.mNeedsCompletelyLoadedDocument),
-      mHistoryBehavior(aOther.mHistoryBehavior),
       mLoadType(aOther.mLoadType),
       mSHEntry(aOther.mSHEntry),
       mTarget(aOther.mTarget),
@@ -240,14 +235,12 @@ nsDocShellLoadState::nsDocShellLoadState(nsIURI* aURI, uint64_t aLoadIdentifier)
       mInheritPrincipal(false),
       mPrincipalIsExplicit(false),
       mNotifiedBeforeUnloadListeners(false),
+      mShouldNotForceReplaceInOnLoad(false),
       mForceAllowDataURI(false),
       mIsExemptFromHTTPSFirstMode(false),
       mOriginalFrameSrc(false),
       mShouldCheckForRecursion(false),
       mIsFormSubmission(false),
-      mShouldNotForceReplaceInOnLoad(false),
-      mNeedsCompletelyLoadedDocument(false),
-      mHistoryBehavior(Nothing()),
       mLoadType(LOAD_NORMAL),
       mSrcdocData(VoidString()),
       mLoadFlags(0),
@@ -677,6 +670,15 @@ void nsDocShellLoadState::SetNotifiedBeforeUnloadListeners(
   mNotifiedBeforeUnloadListeners = aNotifiedBeforeUnloadListeners;
 }
 
+bool nsDocShellLoadState::ShouldNotForceReplaceInOnLoad() const {
+  return mShouldNotForceReplaceInOnLoad;
+}
+
+void nsDocShellLoadState::SetShouldNotForceReplaceInOnLoad(
+    bool aShouldNotForceReplaceInOnLoad) {
+  mShouldNotForceReplaceInOnLoad = aShouldNotForceReplaceInOnLoad;
+}
+
 bool nsDocShellLoadState::ForceAllowDataURI() const {
   return mForceAllowDataURI;
 }
@@ -725,34 +727,6 @@ void nsDocShellLoadState::SetIsFormSubmission(bool aIsFormSubmission) {
   mIsFormSubmission = aIsFormSubmission;
 }
 
-bool nsDocShellLoadState::ShouldNotForceReplaceInOnLoad() const {
-  return mShouldNotForceReplaceInOnLoad;
-}
-
-void nsDocShellLoadState::SetShouldNotForceReplaceInOnLoad(
-    bool aShouldNotForceReplaceInOnLoad) {
-  mShouldNotForceReplaceInOnLoad = aShouldNotForceReplaceInOnLoad;
-}
-
-bool nsDocShellLoadState::NeedsCompletelyLoadedDocument() const {
-  return mNeedsCompletelyLoadedDocument;
-}
-
-void nsDocShellLoadState::SetNeedsCompletelyLoadedDocument(
-    bool aNeedsCompletelyLoadedDocument) {
-  mNeedsCompletelyLoadedDocument = aNeedsCompletelyLoadedDocument;
-}
-
-Maybe<mozilla::dom::NavigationHistoryBehavior>
-nsDocShellLoadState::HistoryBehavior() const {
-  return mHistoryBehavior;
-}
-
-void nsDocShellLoadState::SetHistoryBehavior(
-    mozilla::dom::NavigationHistoryBehavior aHistoryBehavior) {
-  mHistoryBehavior = Some(aHistoryBehavior);
-}
-
 uint32_t nsDocShellLoadState::LoadType() const { return mLoadType; }
 
 void nsDocShellLoadState::SetLoadType(uint32_t aLoadType) {
@@ -1403,9 +1377,6 @@ DocShellLoadStateInit nsDocShellLoadState::Serialize(
   loadState.OriginalFrameSrc() = mOriginalFrameSrc;
   loadState.ShouldCheckForRecursion() = mShouldCheckForRecursion;
   loadState.IsFormSubmission() = mIsFormSubmission;
-  loadState.ShouldNotForceReplaceInOnLoad() = mShouldNotForceReplaceInOnLoad;
-  loadState.NeedsCompletelyLoadedDocument() = mNeedsCompletelyLoadedDocument;
-  loadState.HistoryBehavior() = mHistoryBehavior;
   loadState.LoadType() = mLoadType;
   loadState.userNavigationInvolvement() = mUserNavigationInvolvement;
   loadState.Target() = mTarget;

docshell/base/nsDocShellLoadState.h

@@ -178,16 +178,6 @@ class nsDocShellLoadState final {
 
   void SetIsFormSubmission(bool aIsFormSubmission);
 
-  bool NeedsCompletelyLoadedDocument() const;
-
-  void SetNeedsCompletelyLoadedDocument(bool aNeedsCompletelyLoadedDocument);
-
-  mozilla::Maybe<mozilla::dom::NavigationHistoryBehavior> HistoryBehavior()
-      const;
-
-  void SetHistoryBehavior(
-      mozilla::dom::NavigationHistoryBehavior aHistoryBehavior);
-
   uint32_t LoadType() const;
 
   void SetLoadType(uint32_t aLoadType);
@@ -552,6 +542,10 @@ class nsDocShellLoadState final {
   // notified if applicable.
   bool mNotifiedBeforeUnloadListeners;
 
+  // If this attribute is true, navigations for subframes taking place inside of
+  // an onload handler will not be changed to replace loads.
+  bool mShouldNotForceReplaceInOnLoad;
+
   // Principal we're inheriting. If null, this means the principal should be
   // inherited from the current document. If set to NullPrincipal, the channel
   // will fill in principal information later in the load. See internal comments
@@ -591,18 +585,6 @@ class nsDocShellLoadState final {
   // form submission.
   bool mIsFormSubmission;
 
-  // If this attribute is true, navigations for subframes taking place inside of
-  // an onload handler will not be changed to replace loads.
-  bool mShouldNotForceReplaceInOnLoad;
-
-  // If this attribute is true, we need to check if the current document is
-  // completely loaded to determine if we should perform a push or replace load.
-  bool mNeedsCompletelyLoadedDocument;
-
-  // If this attribute is `Auto`, we should determine if this should be a push
-  // or replace load when actually loading.
-  mozilla::Maybe<mozilla::dom::NavigationHistoryBehavior> mHistoryBehavior;
-
   // Contains a load type as specified by the nsDocShellLoadTypes::load*
   // constants
   uint32_t mLoadType;

docshell/base/nsDocShellLoadTypes.h

@@ -21,7 +21,6 @@
 
 #  define MAKE_LOAD_TYPE(type, flags) ((type) | ((flags) << 16))
 #  define LOAD_TYPE_HAS_FLAGS(type, flags) ((type) & ((flags) << 16))
-#  define LOAD_TYPE_SET_FLAGS(type, flags) ((type) | ((flags) << 16))
 
 /**
  * These are flags that confuse ConvertLoadTypeToDocShellLoadInfo and should
@@ -202,17 +201,5 @@ inline nsDOMNavigationTiming::Type ConvertLoadTypeToNavigationType(
   return result;
 }
 
-static inline uint32_t MaybeAddLoadFlags(uint32_t aLoadType, uint32_t aFlags) {
-  uint32_t loadType = LOAD_TYPE_SET_FLAGS(aLoadType, aFlags);
-  if (IsValidLoadType(loadType)) {
-    return loadType;
-  }
-
-  NS_WARNING("Adjusting load flags results in an invalid load type.");
-  return aLoadType;
-}
-
-#  undef LOAD_TYPE_SET_FLAGS
-
 #endif  // MOZILLA_INTERNAL_API
 #endif

docshell/test/chrome/bug311007_window.xhtml

@@ -114,13 +114,6 @@ function step2A() {
 }
 
 function step2B(aWebProgress, aRequest, aLocation, aFlags) {
-  content.addEventListener(
-    'load',
-    () => step2C(aWebProgress, aRequest, aLocation, aFlags),
-    {once: true});
-}
-
-function step2C(aWebProgress, aRequest, aLocation, aFlags) {
   is(aLocation.spec, kSecureURI, "A URI on HTTPS (2)");
 
   ok(!(aFlags & Ci.nsIWebProgressListener

dom/base/Document.cpp

@@ -1391,7 +1391,6 @@ Document::Document(const char* aContentType)
       mHaveFiredTitleChange(false),
       mIsShowing(false),
       mVisible(true),
-      mIsCompletelyLoaded(false),
       mRemovedFromDocShell(false),
       // mAllowDNSPrefetch starts true, so that we can always reliably && it
       // with various values that might disable it.  Since we never prefetch
@@ -12573,8 +12572,6 @@ void Document::OnPageShow(bool aPersisted, EventTarget* aDispatchStartTarget,
   if (auto* wgc = GetWindowGlobalChild()) {
     wgc->UnblockBFCacheFor(BFCacheStatus::PAGE_LOADING);
   }
-
-  mIsCompletelyLoaded = true;
 }
 
 static void DispatchFullscreenChange(Document& aDocument, nsINode* aTarget) {

dom/base/Document.h

@@ -2676,20 +2676,12 @@ class Document : public nsINode,
    * called yet.
    */
   bool IsShowing() const { return mIsShowing; }
-
   /**
    * Return whether the document is currently visible (in the sense of
    * OnPageHide having been called and OnPageShow not yet having been called)
    */
   bool IsVisible() const { return mVisible; }
 
-  /**
-   * Return whether the document has completely finished loading, in the spec
-   * sense. We only store a bool though, whereas spec stores when loading
-   * finished. See https://html.spec.whatwg.org/#completely-loaded-time
-   */
-  bool IsCompletelyLoaded() const { return mIsCompletelyLoaded; }
-
   void SetSuppressedEventListener(EventListener* aListener);
 
   EventListener* GetSuppressedEventListener() {
@@ -4846,10 +4838,6 @@ class Document : public nsINode,
   // it's false only when we're in bfcache or unloaded.
   bool mVisible : 1;
 
-  // State for IsCompletelyLoaded. Starts off false and becomes true after
-  // pageshow has fired. Doesn't reset after that.
-  bool mIsCompletelyLoaded : 1;
-
   // True if our content viewer has been removed from the docshell
   // (it may still be displayed, but in zombie state). Form control data
   // has been saved.