<!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>[203760] 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/203760">203760</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 21:12:11 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Second parameter to History.pushState() / replaceState() should be mandatory
https://bugs.webkit.org/show_bug.cgi?id=160230
Reviewed by Sam Weinig.
LayoutTests/imported/w3c:
Rebaseline W3C test now that more checks are passing.
* web-platform-tests/html/dom/interfaces-expected.txt:
Source/WebCore:
Second parameter to History.pushState() / replaceState() should be mandatory:
- https://html.spec.whatwg.org/multipage/browsers.html#history-3
Firefox and Chrome agree with the specification.
No new tests, rebaselined existing test.
* bindings/js/JSHistoryCustom.cpp:
(WebCore::JSHistory::pushState):
(WebCore::JSHistory::replaceState):
* page/History.idl:
LayoutTests:
* fast/history/state-api-parameters.html: Added.
* fast/history/state-api-parameters-expected.txt: Added.
Add layout test coverage.
* fast/history/replacestate-nocrash.html:
* fast/loader/stateobjects/popstate-fires-with-page-cache.html:
Update existing tests to reflect behavior change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasthistoryreplacestatenocrashhtml">trunk/LayoutTests/fast/history/replacestate-nocrash.html</a></li>
<li><a href="#trunkLayoutTestsfastloaderstateobjectspopstatefireswithpagecachehtml">trunk/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHistoryCustomcpp">trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorepageHistoryidl">trunk/Source/WebCore/page/History.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthistorystateapiparametersexpectedtxt">trunk/LayoutTests/fast/history/state-api-parameters-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthistorystateapiparametershtml">trunk/LayoutTests/fast/history/state-api-parameters.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/LayoutTests/ChangeLog 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-26 Chris Dumez <cdumez@apple.com>
+
+ Second parameter to History.pushState() / replaceState() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=160230
+
+ Reviewed by Sam Weinig.
+
+ * fast/history/state-api-parameters.html: Added.
+ * fast/history/state-api-parameters-expected.txt: Added.
+ Add layout test coverage.
+
+ * fast/history/replacestate-nocrash.html:
+ * fast/loader/stateobjects/popstate-fires-with-page-cache.html:
+ Update existing tests to reflect behavior change.
+
</ins><span class="cx"> 2016-07-26 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking inspector/memory/tracking.html as flaky on mac-wk1 debug
</span></span></pre></div>
<a id="trunkLayoutTestsfasthistoryreplacestatenocrashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/history/replacestate-nocrash.html (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/replacestate-nocrash.html 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/LayoutTests/fast/history/replacestate-nocrash.html 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx">
</span><del>-Object.prototype.__defineSetter__("foo",function(){history.replaceState("")});
-history.replaceState({foo:1,zzz:"a".repeat(1<<22)});
</del><ins>+Object.prototype.__defineSetter__("foo",function(){history.replaceState("", "")});
+history.replaceState({foo:1,zzz:"a".repeat(1<<22)}, "");
</ins><span class="cx"> history.state.length;
</span><span class="cx"> </script>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfasthistorystateapiparametersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/history/state-api-parameters-expected.txt (0 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/state-api-parameters-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/history/state-api-parameters-expected.txt 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Tests that the second parameter to history.replaceState() / pushState() is mandatory.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS history.replaceState() threw exception TypeError: Not enough arguments.
+PASS history.replaceState({}) threw exception TypeError: Not enough arguments.
+PASS history.pushState() threw exception TypeError: Not enough arguments.
+PASS history.pushState({}) threw exception TypeError: Not enough arguments.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthistorystateapiparametershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/history/state-api-parameters.html (0 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/state-api-parameters.html (rev 0)
+++ trunk/LayoutTests/fast/history/state-api-parameters.html 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests that the second parameter to history.replaceState() / pushState() is mandatory.");
+
+shouldThrow("history.replaceState()", "'TypeError: Not enough arguments'");
+shouldThrow("history.replaceState({})", "'TypeError: Not enough arguments'");
+shouldThrow("history.pushState()", "'TypeError: Not enough arguments'");
+shouldThrow("history.pushState({})", "'TypeError: Not enough arguments'");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderstateobjectspopstatefireswithpagecachehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> switch (testWindowLoadFireCount) {
</span><span class="cx"> case 1:
</span><span class="cx"> debug('pushState with new state object for page 1');
</span><del>- testWindow.history.pushState('newState');
</del><ins>+ testWindow.history.pushState('newState', '');
</ins><span class="cx"> debug('going to page 2');
</span><span class="cx"> // Set the location in a timeout to generate a history entry
</span><span class="cx"> setTimeout(function() {testWindow.location.href = 'resources/popstate-fires-with-page-cache-2.html';}, 0);
</span><span class="lines">@@ -72,4 +72,4 @@
</span><span class="cx"> var jsTestIsAsync = true;
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-07-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Second parameter to History.pushState() / replaceState() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=160230
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/html/dom/interfaces-expected.txt:
+
+2016-07-26 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Align Node.isEqualNode() with the specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160224
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -5550,13 +5550,9 @@
</span><span class="cx"> PASS History interface: window.history must inherit property "back" with the proper type (4)
</span><span class="cx"> PASS History interface: window.history must inherit property "forward" with the proper type (5)
</span><span class="cx"> PASS History interface: window.history must inherit property "pushState" with the proper type (6)
</span><del>-FAIL History interface: calling pushState(any,DOMString,DOMString) on window.history with too few arguments must throw TypeError assert_throws: Called with 0 arguments function "function () {
- fn.apply(obj, args);
- }" did not throw
</del><ins>+PASS History interface: calling pushState(any,DOMString,DOMString) on window.history with too few arguments must throw TypeError
</ins><span class="cx"> PASS History interface: window.history must inherit property "replaceState" with the proper type (7)
</span><del>-FAIL History interface: calling replaceState(any,DOMString,DOMString) on window.history with too few arguments must throw TypeError assert_throws: Called with 0 arguments function "function () {
- fn.apply(obj, args);
- }" did not throw
</del><ins>+PASS History interface: calling replaceState(any,DOMString,DOMString) on window.history with too few arguments must throw TypeError
</ins><span class="cx"> PASS Location interface: existence and properties of interface object
</span><span class="cx"> PASS Location interface object length
</span><span class="cx"> PASS Location interface object name
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/Source/WebCore/ChangeLog 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-07-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Second parameter to History.pushState() / replaceState() should be mandatory
+ https://bugs.webkit.org/show_bug.cgi?id=160230
+
+ Reviewed by Sam Weinig.
+
+ Second parameter to History.pushState() / replaceState() should be mandatory:
+ - https://html.spec.whatwg.org/multipage/browsers.html#history-3
+
+ Firefox and Chrome agree with the specification.
+
+ No new tests, rebaselined existing test.
+
+ * bindings/js/JSHistoryCustom.cpp:
+ (WebCore::JSHistory::pushState):
+ (WebCore::JSHistory::replaceState):
+ * page/History.idl:
+
+2016-07-26 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Align Node.isEqualNode() with the specification
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160224
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHistoryCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -55,17 +55,22 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSHistory::pushState(ExecState& state)
</span><span class="cx"> {
</span><del>- auto historyState = SerializedScriptValue::create(&state, state.argument(0), 0, 0);
</del><ins>+ auto argCount = state.argumentCount();
+ if (UNLIKELY(argCount < 2))
+ return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
+
+ auto historyState = SerializedScriptValue::create(&state, state.uncheckedArgument(0), 0, 0);
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><del>- String title = valueToStringWithUndefinedOrNullCheck(&state, state.argument(1));
</del><ins>+ // FIXME: title should not be nullable.
+ String title = valueToStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(1));
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> String url;
</span><del>- if (state.argumentCount() > 2) {
- url = valueToStringWithUndefinedOrNullCheck(&state, state.argument(2));
</del><ins>+ if (argCount > 2) {
+ url = valueToStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(2));
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -81,17 +86,22 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSHistory::replaceState(ExecState& state)
</span><span class="cx"> {
</span><del>- auto historyState = SerializedScriptValue::create(&state, state.argument(0), 0, 0);
</del><ins>+ auto argCount = state.argumentCount();
+ if (UNLIKELY(argCount < 2))
+ return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
+
+ auto historyState = SerializedScriptValue::create(&state, state.uncheckedArgument(0), 0, 0);
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><del>- String title = valueToStringWithUndefinedOrNullCheck(&state, state.argument(1));
</del><ins>+ // FIXME: title should not be nullable.
+ String title = valueToStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(1));
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> String url;
</span><del>- if (state.argumentCount() > 2) {
- url = valueToStringWithUndefinedOrNullCheck(&state, state.argument(2));
</del><ins>+ if (argCount > 2) {
+ url = valueToStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(2));
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageHistoryidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/History.idl (203759 => 203760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/History.idl 2016-07-27 03:42:30 UTC (rev 203759)
+++ trunk/Source/WebCore/page/History.idl 2016-07-27 04:12:11 UTC (rev 203760)
</span><span class="lines">@@ -33,6 +33,6 @@
</span><span class="cx"> [CallWith=Document, ForwardDeclareInHeader] void forward();
</span><span class="cx"> [CallWith=Document, ForwardDeclareInHeader] void go(optional long distance = 0);
</span><span class="cx">
</span><del>- [Custom, RaisesException] void pushState(any data, DOMString title, optional DOMString url);
- [Custom, RaisesException] void replaceState(any data, DOMString title, optional DOMString url);
</del><ins>+ [Custom, RaisesException] void pushState(any data, DOMString title, optional DOMString? url = null);
+ [Custom, RaisesException] void replaceState(any data, DOMString title, optional DOMString? url = null);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>