Bug 1621643: Ensure replaceState updates all listeners about the modi…

…fied state r=peterv Differential Revision: https://phabricator.services.mozilla.com/D91433
iaxat · Sep 28, 2020 · 95e052d · 95e052d
1 parent b9deebe
commit 95e052d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
@@ -613,7 +613,11 @@ void CanonicalBrowsingContext::SetActiveSessionHistoryEntryForFrame(
 
 void CanonicalBrowsingContext::ReplaceActiveSessionHistoryEntry(
     SessionHistoryInfo* aInfo) {
+  nsSHistory* shistory = static_cast<nsSHistory*>(GetSessionHistory());
   mActiveEntry->SetInfo(aInfo);
+  // Notify children of the update
+  shistory->NotifyOnHistoryReplaceEntry();
+  shistory->UpdateRootBrowsingContextState();
   // FIXME Need to do the equivalent of EvictContentViewersOrReplaceEntry.
 }
 

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
@@ -10776,6 +10776,10 @@ void nsDocShell::SetReferrerInfo(nsIReferrerInfo* aReferrerInfo) {
 NS_IMETHODIMP
 nsDocShell::AddState(JS::Handle<JS::Value> aData, const nsAString& aTitle,
                      const nsAString& aURL, bool aReplace, JSContext* aCx) {
+  MOZ_LOG(gSHLog, LogLevel::Debug,
+          ("nsDocShell[%p]: AddState(..., %s, %s, %d)", this,
+           NS_ConvertUTF16toUTF8(aTitle).get(),
+           NS_ConvertUTF16toUTF8(aURL).get(), aReplace));
   // Implements History.pushState and History.replaceState
 
   // Here's what we do, roughly in the order specified by HTML5.  The specific

diff --git a/docshell/shistory/nsSHistory.cpp b/docshell/shistory/nsSHistory.cpp
@@ -828,6 +828,11 @@ nsSHistory::AddEntry(nsISHEntry* aSHEntry, bool aPersist) {
   return NS_OK;
 }
 
+void
+nsSHistory::NotifyOnHistoryReplaceEntry() {
+  NOTIFY_LISTENERS(OnHistoryReplaceEntry, ());
+}
+
 /* Get size of the history list */
 NS_IMETHODIMP
 nsSHistory::GetCount(int32_t* aResult) {

diff --git a/docshell/shistory/nsSHistory.h b/docshell/shistory/nsSHistory.h
@@ -135,6 +135,8 @@ class nsSHistory : public mozilla::LinkedListElement<nsSHistory>,
 
   nsTArray<nsCOMPtr<nsISHEntry>>& Entries() { return mEntries; }
 
+  void NotifyOnHistoryReplaceEntry();
+
   void RemoveEntries(nsTArray<nsID>& aIDs, int32_t aStartIndex,
                      bool* aDidRemove);
 
@@ -181,6 +183,10 @@ class nsSHistory : public mozilla::LinkedListElement<nsSHistory>,
     return mRequestedIndex == -1 ? mIndex : mRequestedIndex;
   }
 
+  // Update the root browsing context state when adding, removing or
+  // replacing entries.
+  void UpdateRootBrowsingContextState();
+
  protected:
   virtual ~nsSHistory();
 
@@ -243,10 +249,6 @@ class nsSHistory : public mozilla::LinkedListElement<nsSHistory>,
                                             nsISHEntry* aOldEntry,
                                             nsISHEntry* aNewEntry);
 
-  // Update the root browsing context state when adding, removing or
-  // replacing entries.
-  void UpdateRootBrowsingContextState();
-
  protected:
   bool mHasOngoingUpdate;
   bool mIsRemote;