Changeset 170404 in webkit

Timestamp:

Jun 24, 2014 4:33:55 PM (10 years ago)

Author:

mrowe@apple.com

Message:

WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used
<​https://webkit.org/b/134271> / <rdar://problem/16270167>

Reviewed by Brady Eidson.

Source/WebCore:
Tests: http/tests/globalhistory/history-delegate-pushstate.html

http/tests/globalhistory/history-delegate-replacestate.html

• page/History.cpp:

(WebCore::History::stateObjectAdded): Call HistoryController after updating the document's URL so that the
URL will reflect the destination of the navigation when FrameLoaderClient::updateGlobalHistory is called.

LayoutTests:

• http/tests/globalhistory/history-delegate-pushstate-expected.txt: Added.
• http/tests/globalhistory/history-delegate-pushstate.html: Added.
• http/tests/globalhistory/history-delegate-replacestate-expected.txt: Added.
• http/tests/globalhistory/history-delegate-replacestate.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt (added)
• LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html (added)
• LayoutTests/http/tests/globalhistory/history-delegate-replacestate-expected.txt (added)
• LayoutTests/http/tests/globalhistory/history-delegate-replacestate.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/History.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-06-24  Mark Rowe  <mrowe@apple.com>
+
+        WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used
+        <https://webkit.org/b/134271> / <rdar://problem/16270167>
+
+        Reviewed by Brady Eidson.
+
+        * http/tests/globalhistory/history-delegate-pushstate-expected.txt: Added.
+        * http/tests/globalhistory/history-delegate-pushstate.html: Added.
+        * http/tests/globalhistory/history-delegate-replacestate-expected.txt: Added.
+        * http/tests/globalhistory/history-delegate-replacestate.html: Added.
+
 2014-06-24  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-24  Mark Rowe  <mrowe@apple.com>
+
+        WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used
+        <https://webkit.org/b/134271> / <rdar://problem/16270167>
+
+        Reviewed by Brady Eidson.
+
+        Tests: http/tests/globalhistory/history-delegate-pushstate.html
+               http/tests/globalhistory/history-delegate-replacestate.html
+
+        * page/History.cpp:
+        (WebCore::History::stateObjectAdded): Call HistoryController after updating the document's URL so that the
+        URL will reflect the destination of the navigation when FrameLoaderClient::updateGlobalHistory is called.
+
 2014-06-24  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/page/History.cpp

@@ -148 +148 @@
     }
 
-    if (stateObjectType == StateObjectType::Push)
-        m_frame->loader().history().pushState(data, title, fullURL.string());
-    else if (stateObjectType == StateObjectType::Replace)
-        m_frame->loader().history().replaceState(data, title, fullURL.string());
-            
     if (!urlString.isEmpty())
         m_frame->document()->updateURLForPushOrReplaceState(fullURL);
 
-    if (stateObjectType == StateObjectType::Push)
+    if (stateObjectType == StateObjectType::Push) {
+        m_frame->loader().history().pushState(data, title, fullURL.string());
         m_frame->loader().client().dispatchDidPushStateWithinPage();
-    else if (stateObjectType == StateObjectType::Replace)
+    } else if (stateObjectType == StateObjectType::Replace) {
+        m_frame->loader().history().replaceState(data, title, fullURL.string());
         m_frame->loader().client().dispatchDidReplaceStateWithinPage();
+    }
 }