<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170404] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170404">170404</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2014-06-24 16:33:55 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageHistorycpp">trunk/Source/WebCore/page/History.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsglobalhistoryhistorydelegatepushstateexpectedtxt">trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsglobalhistoryhistorydelegatepushstatehtml">trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html</a></li>
<li><a href="#trunkLayoutTestshttptestsglobalhistoryhistorydelegatereplacestateexpectedtxt">trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsglobalhistoryhistorydelegatereplacestatehtml">trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170403 => 170404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-24 23:33:03 UTC (rev 170403)
+++ trunk/LayoutTests/ChangeLog 2014-06-24 23:33:55 UTC (rev 170404)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-06-24 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS JIT: Add positionInRootFragments to SelectorFragment
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsglobalhistoryhistorydelegatepushstateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt (0 => 170404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt 2014-06-24 23:33:55 UTC (rev 170404)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?1" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?2" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?3" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?4" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?5" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+This tests functionality of the history delegate related to history.pushState.
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsglobalhistoryhistorydelegatepushstatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html (0 => 170404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html (rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html 2014-06-24 23:33:55 UTC (rev 170404)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+}
+
+var n = 0;
+function runTest() {
+ if (++n > 5) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ return;
+ }
+ history.pushState({}, 'State ' + n, 'http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?' + n);
+ setTimeout(runTest, 10);
+}
+
+</script>
+<body onload="setTimeout(runTest, 10);">
+This tests functionality of the history delegate related to history.pushState.
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsglobalhistoryhistorydelegatereplacestateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate-expected.txt (0 => 170404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate-expected.txt 2014-06-24 23:33:55 UTC (rev 170404)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-replacestate.html" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-replacestate.html?1" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-replacestate.html?2" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-replacestate.html?3" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-replacestate.html?4" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+WebView navigated to url "http://127.0.0.1:8000/globalhistory/history-delegate-replacestate.html?5" with title "" with HTTP equivalent method "GET". The navigation was successful and was not a client redirect.
+This tests functionality of the history delegate related to history.replaceState.
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsglobalhistoryhistorydelegatereplacestatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate.html (0 => 170404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate.html (rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate.html 2014-06-24 23:33:55 UTC (rev 170404)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<script>
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ testRunner.dumpFrameLoadCallbacks();
+}
+
+var n = 0;
+function runTest() {
+ if (++n > 5) {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ return;
+ }
+ history.replaceState({}, 'State ' + n, 'http://127.0.0.1:8000/globalhistory/history-delegate-replacestate.html?' + n);
+ setTimeout(runTest, 10);
+}
+
+</script>
+<body onload="setTimeout(runTest, 10);">
+This tests functionality of the history delegate related to history.replaceState.
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170403 => 170404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-24 23:33:03 UTC (rev 170403)
+++ trunk/Source/WebCore/ChangeLog 2014-06-24 23:33:55 UTC (rev 170404)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-06-24 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> advanceByCombiningCharacterSequence() can be simplified
</span></span></pre></div>
<a id="trunkSourceWebCorepageHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/History.cpp (170403 => 170404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/History.cpp 2014-06-24 23:33:03 UTC (rev 170403)
+++ trunk/Source/WebCore/page/History.cpp 2014-06-24 23:33:55 UTC (rev 170404)
</span><span class="lines">@@ -147,18 +147,16 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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());
-
</del><span class="cx"> if (!urlString.isEmpty())
</span><span class="cx"> m_frame->document()->updateURLForPushOrReplaceState(fullURL);
</span><span class="cx">
</span><del>- if (stateObjectType == StateObjectType::Push)
</del><ins>+ if (stateObjectType == StateObjectType::Push) {
+ m_frame->loader().history().pushState(data, title, fullURL.string());
</ins><span class="cx"> m_frame->loader().client().dispatchDidPushStateWithinPage();
</span><del>- else if (stateObjectType == StateObjectType::Replace)
</del><ins>+ } else if (stateObjectType == StateObjectType::Replace) {
+ m_frame->loader().history().replaceState(data, title, fullURL.string());
</ins><span class="cx"> m_frame->loader().client().dispatchDidReplaceStateWithinPage();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>