From 23d683cf6ba9e1e568516d730681421786098b00 Mon Sep 17 00:00:00 2001
From: Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
Date: Sun, 21 Apr 2024 11:18:35 +0200
Subject: [PATCH] LibWeb: Update document url after same-document back/forward
 navigation

Seems like a specification bug, but other browsers update url before
popstate event is fired and so should we.

Fixes back/forward navigation on GitHub.
---
 Tests/LibWeb/Text/data/iframe-popstate-event.html           | 6 ++++--
 .../Text/expected/navigation/history-popstate-event.txt     | 2 +-
 Userland/Libraries/LibWeb/DOM/Document.cpp                  | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Tests/LibWeb/Text/data/iframe-popstate-event.html b/Tests/LibWeb/Text/data/iframe-popstate-event.html
index d2ec29fdb6b..24ea968ac29 100644
--- a/Tests/LibWeb/Text/data/iframe-popstate-event.html
+++ b/Tests/LibWeb/Text/data/iframe-popstate-event.html
@@ -1,8 +1,10 @@
 <script>
-    window.history.pushState({}, '', '');
+    window.history.pushState({}, '', window.location.href + '#test');
 
     window.addEventListener('popstate', (e) => {
-        parent.postMessage('popstate event from iframe', '*');
+        const url = new URL(window.location.href);
+        const pathWithHash = url.pathname.split('/').pop() + url.hash;
+        parent.postMessage(`popstate event from iframe new_path=${pathWithHash}`, '*');
     });
 
     window.history.back();
diff --git a/Tests/LibWeb/Text/expected/navigation/history-popstate-event.txt b/Tests/LibWeb/Text/expected/navigation/history-popstate-event.txt
index ddb5e9a68b2..339730f9c11 100644
--- a/Tests/LibWeb/Text/expected/navigation/history-popstate-event.txt
+++ b/Tests/LibWeb/Text/expected/navigation/history-popstate-event.txt
@@ -1 +1 @@
-  popstate event from iframe
+  popstate event from iframe new_path=iframe-popstate-event.html
diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp
index fc23918ecf1..94500538865 100644
--- a/Userland/Libraries/LibWeb/DOM/Document.cpp
+++ b/Userland/Libraries/LibWeb/DOM/Document.cpp
@@ -4070,6 +4070,9 @@ void Document::update_for_history_step_application(JS::NonnullGCPtr<HTML::Sessio
 
         // 5. If documentIsNew is false, then:
         if (!document_is_new) {
+            // NOTE: Not in the spec, but otherwise document's url won't be updated in case of a same-document back/forward navigation.
+            set_url(entry->url());
+
             // AD HOC: Skip this in situations the spec steps don't account for
             if (update_navigation_api) {
                 // 1. Update the navigation API entries for a same-document navigation given navigation, entry, and "traverse".