282622 2024-11-05 10:46:40 -0800 [Navigation] Cross document push navigations don't prune correctly 2024-12-09 08:22:42 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 258384 1 pgriffis cdumez webkit-bug-importer oldest_to_newest 2072875 0 pgriffis 2024-11-05 10:46:40 -0800 This is test navigation-api/navigation-history-entry/entries-after-cross-document-forward-pruning.html This is resolved by fixing this fixme: https://github.com/WebKit/WebKit/blob/ac9f0488c548bf6c6bc855059c6b3b27929b1b81/Source/WebCore/page/Navigation.cpp#L141 A diff such as this would be the starting point: diff --git a/Source/WebCore/page/Navigation.cpp b/Source/WebCore/page/Navigation.cpp index cf5725257363..c0753548cfb2 100644 --- a/Source/WebCore/page/Navigation.cpp +++ b/Source/WebCore/page/Navigation.cpp @@ -138,7 +138,7 @@ void Navigation::initializeForNewWindow(std::optional<NavigationNavigationType> // FIXME: This should handle Push, however somewhere before here the currentEntry of previousNavigation was updated // to the new navigation so we get duplicate entries. - if (navigationType != NavigationNavigationType::Push) { + if (true) { if (navigationType == NavigationNavigationType::Traverse) { m_currentEntryIndex = getEntryIndexOfHistoryItem(m_entries, *currentItem); if (m_currentEntryIndex) { @@ -151,6 +151,11 @@ void Navigation::initializeForNewWindow(std::optional<NavigationNavigationType> } else { Ref previousEntry = m_entries[*previousNavigation->m_currentEntryIndex]; + if (navigationType == NavigationNavigationType::Push) { + m_entries.resize(*previousNavigation->m_currentEntryIndex + 1); // Prune forward entries. + m_entries.append(NavigationHistoryEntry::create(protectedScriptExecutionContext().get(), *currentItem)); // fixme + } + if (navigationType == NavigationNavigationType::Replace) m_entries[*previousNavigation->m_currentEntryIndex] = NavigationHistoryEntry::create(protectedScriptExecutionContext().get(), *currentItem); 2074557 1 webkit-bug-importer 2024-11-12 10:47:14 -0800 <rdar://problem/139734080> 2079441 2 cdumez 2024-12-05 11:35:09 -0800 Pull request: https://github.com/WebKit/WebKit/pull/37500 2080200 3 ews-feeder 2024-12-09 08:22:40 -0800 Committed 287548@main (e08f45aa8902): <https://commits.webkit.org/287548@main> Reviewed commits have been landed. Closing PR #37500 and removing active labels.