tor-browser

commit 2b3288d74297ef45450868b224edb796172a87b7
parent 173a98cdaaa1bf07a5802632dc0133a5a82c3499
Author: Adam Vandolder <avandolder@mozilla.com>
Date:   Mon, 27 Oct 2025 19:58:10 +0000

Bug 1996665 - Place assertions in SetActiveSessionHistoryEntryFromBFCache behind the Navigation API strict pref. r=dom-core,jjaschke

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

Diffstat:
M
docshell/base/CanonicalBrowsingContext.cpp
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
@@ -487,8 +487,13 @@ void CanonicalBrowsingContext::SetActiveSessionHistoryEntryFromBFCache(
     SessionHistoryEntry* aEntry) {
   mActiveEntry = aEntry;
   if (Navigation::IsAPIEnabled()) {
-    MOZ_DIAGNOSTIC_ASSERT(!aEntry || mActiveEntryList.contains(aEntry));
-    MOZ_DIAGNOSTIC_ASSERT(aEntry || mActiveEntryList.isEmpty());
+    if (StaticPrefs::dom_navigation_api_strict_enabled()) {
+      MOZ_DIAGNOSTIC_ASSERT(!aEntry || mActiveEntryList.contains(aEntry));
+      MOZ_DIAGNOSTIC_ASSERT(aEntry || mActiveEntryList.isEmpty());
+    } else {
+      MOZ_ASSERT(!aEntry || mActiveEntryList.contains(aEntry));
+      MOZ_ASSERT(aEntry || mActiveEntryList.isEmpty());
+    }
   }
 }