Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (232609 => 232610)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2018-06-08 02:19:39 UTC (rev 232609)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2018-06-08 03:08:14 UTC (rev 232610)
@@ -1,3 +1,17 @@
+2018-06-07 Chris Dumez <[email protected]>
+
+ PopStateEvent should not be cancelable by default
+ https://bugs.webkit.org/show_bug.cgi?id=186420
+
+ Reviewed by Darin Adler.
+
+ Resync web-platform-tests after:
+ https://github.com/web-platform-tests/wpt/pull/11355
+
+ * web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event-expected.txt:
+ * web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html:
+ * web-platform-tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html:
+
2018-06-07 Brendan McLoughlin <[email protected]>
Update web-platform-tests github location in webkitpy.w3c.test_importer
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event-expected.txt (232609 => 232610)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event-expected.txt 2018-06-08 02:19:39 UTC (rev 232609)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event-expected.txt 2018-06-08 03:08:14 UTC (rev 232610)
@@ -1,3 +1,3 @@
-FAIL Queue a task to fire hashchange event assert_true: bubble expected true got false
+PASS Queue a task to fire hashchange event
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html (232609 => 232610)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html 2018-06-08 02:19:39 UTC (rev 232609)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/hashchange_event.html 2018-06-08 03:08:14 UTC (rev 232610)
@@ -18,11 +18,11 @@
location.hash = 'foo';
window._onhashchange_ = t.step_func(function (e) {
- assert_true(e.isTrusted);
- assert_equals(e.target, window);
- assert_equals(e.type, "hashchange");
- assert_true(e instanceof HashChangeEvent);
- assert_true(e.bubbles, "bubble");
+ assert_true(e.isTrusted, "isTrusted");
+ assert_equals(e.target, window, "target");
+ assert_equals(e.type, "hashchange", "type");
+ assert_true(e instanceof HashChangeEvent, "is HashChangeEvent");
+ assert_false(e.bubbles, "bubbles");
assert_false(e.cancelable, "cancelable");
oldURLs.push(e.oldURL);
newURLs.push(e.newURL);
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html (232609 => 232610)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html 2018-06-08 02:19:39 UTC (rev 232609)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html 2018-06-08 03:08:14 UTC (rev 232610)
@@ -15,6 +15,13 @@
history.back();
window._onpopstate_ = t.step_func(function (e) {
+ assert_true(e.isTrusted, "isTrusted");
+ assert_equals(e.target, window, "target");
+ assert_equals(e.type, "popstate", "type");
+ assert_true(e instanceof PopStateEvent, "is PopStateEvent");
+ assert_false(e.bubbles, "bubbles");
+ assert_false(e.cancelable, "cancelable");
+
states.push(e.state);
if (states.length === 2) {
Modified: trunk/Source/WebCore/ChangeLog (232609 => 232610)
--- trunk/Source/WebCore/ChangeLog 2018-06-08 02:19:39 UTC (rev 232609)
+++ trunk/Source/WebCore/ChangeLog 2018-06-08 03:08:14 UTC (rev 232610)
@@ -1,3 +1,21 @@
+2018-06-07 Chris Dumez <[email protected]>
+
+ PopStateEvent should not be cancelable by default
+ https://bugs.webkit.org/show_bug.cgi?id=186420
+
+ Reviewed by Darin Adler.
+
+ PopStateEvent should not be cancelable by default:
+ - https://github.com/web-platform-tests/wpt/pull/11355
+ - https://html.spec.whatwg.org/#history-traversal
+
+ All other browsers agree with the specification.
+
+ No new tests, updated existing tests.
+
+ * dom/PopStateEvent.cpp:
+ (WebCore::PopStateEvent::PopStateEvent):
+
2018-06-07 Simon Fraser <[email protected]>
Remove a log that was left in by mistake.
Modified: trunk/Source/WebCore/dom/PopStateEvent.cpp (232609 => 232610)
--- trunk/Source/WebCore/dom/PopStateEvent.cpp 2018-06-08 02:19:39 UTC (rev 232609)
+++ trunk/Source/WebCore/dom/PopStateEvent.cpp 2018-06-08 03:08:14 UTC (rev 232610)
@@ -40,7 +40,7 @@
}
PopStateEvent::PopStateEvent(RefPtr<SerializedScriptValue>&& serializedState, History* history)
- : Event(eventNames().popstateEvent, false, true)
+ : Event(eventNames().popstateEvent, false, false)
, m_serializedState(WTFMove(serializedState))
, m_history(history)
{
