Diff
Modified: trunk/LayoutTests/ChangeLog (206575 => 206576)
--- trunk/LayoutTests/ChangeLog 2016-09-29 03:58:33 UTC (rev 206575)
+++ trunk/LayoutTests/ChangeLog 2016-09-29 04:44:24 UTC (rev 206576)
@@ -1,3 +1,16 @@
+2016-09-28 Chris Dumez <[email protected]>
+
+ Import touch-events web-platform-tests
+ https://bugs.webkit.org/show_bug.cgi?id=162713
+
+ Reviewed by Alex Christensen.
+
+ Skip on all platforms that do not have Touch enabled.
+
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+
2016-09-28 Ryan Haddad <[email protected]>
Marking fast/images/object-image.html as crashing.
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (206575 => 206576)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-29 03:58:33 UTC (rev 206575)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-29 04:44:24 UTC (rev 206576)
@@ -1,5 +1,32 @@
2016-09-28 Chris Dumez <[email protected]>
+ Import touch-events web-platform-tests
+ https://bugs.webkit.org/show_bug.cgi?id=162713
+
+ Reviewed by Alex Christensen.
+
+ Import touch-events web-platform-tests.
+
+ * web-platform-tests/touch-events/OWNERS: Added.
+ * web-platform-tests/touch-events/create-touch-touchlist.html: Added.
+ * web-platform-tests/touch-events/historical.html: Added.
+ * web-platform-tests/touch-events/multi-touch-interactions.js: Added.
+ (debug_print):
+ (check_list_subset_of_two_targetlists):
+ (is_at_least_one_item_in_targetlist):
+ (check_no_item_in_targetlist):
+ (check_targets):
+ (run.):
+ (run):
+ * web-platform-tests/touch-events/touch-globaleventhandler-interface.html: Added.
+ * web-platform-tests/touch-events/touch-support.js: Added.
+ (check_Touch_object):
+ (check_TouchEvent):
+ * web-platform-tests/touch-events/touch-touchevent-constructor.html: Added.
+ * web-platform-tests/touch-events/w3c-import.log: Added.
+
+2016-09-28 Chris Dumez <[email protected]>
+
Add support for DOMTokenList.supports()
https://bugs.webkit.org/show_bug.cgi?id=162659
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/OWNERS (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/OWNERS (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/OWNERS 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,3 @@
+@jtangelder
+@zqzhang
+@cynthia
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/create-touch-touchlist.html (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/create-touch-touchlist.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/create-touch-touchlist.html 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>document.createTouch and document.createTouchList Tests</title>
+<script src=""
+<script src=""
+<script src=""
+<body>
+<div id="target0"></div>
+<script>
+test(function() {
+ var testTarget = document.getElementById('target0');
+ var touch1 = document.createTouch(window, testTarget, 42, 15, 20, 35, 40);
+ assert_equals(touch1.target, testTarget, "touch.target is target0");
+ assert_equals(touch1.identifier, 42, "touch.identifier is requested value");
+ assert_equals(touch1.pageX, 15, "touch.pageX is requested value");
+ assert_equals(touch1.pageY, 20, "touch.pageY is requested value");
+ assert_equals(touch1.screenX, 35, "touch.screenX is requested value");
+ assert_equals(touch1.screenY, 40, "touch.screenY is requested value");
+}, "document.createTouch exists and creates a Touch object with requested properties");
+
+test(function() {
+ var touchList = document.createTouchList();
+ assert_equals(touchList.length, 0, "touchList.length is 0");
+ check_TouchList_object(touchList);
+}, "document.createTouchList exists and correctly creates a TouchList from zero Touch objects");
+
+test(function() {
+ var testTarget = document.getElementById('target0');
+ var touch1 = document.createTouch(window, testTarget, 42, 15, 20, 35, 40);
+ var touchList = document.createTouchList(touch1);
+ assert_equals(touchList.length, 1, "touchList.length is 1");
+ assert_equals(touchList.item(0), touch1, "touchList.item(0) is touch1");
+ check_TouchList_object(touchList);
+}, "document.createTouchList exists and correctly creates a TouchList from a single Touch");
+
+test(function() {
+ var testTarget = document.getElementById('target0');
+ var touch1 = document.createTouch(window, testTarget, 42, 15, 20, 35, 40);
+ var touch2 = document.createTouch(window, target0, 44, 25, 30, 45, 50);
+ var touchList = document.createTouchList(touch1, touch2);
+ assert_equals(touchList.length, 2, "touchList.length is 2");
+ assert_equals(touchList.item(0), touch1, "touchList.item(0) is touch1");
+ assert_equals(touchList.item(1), touch2, "touchList.item(1) is touch2");
+ check_TouchList_object(touchList);
+}, "document.createTouchList exists and correctly creates a TouchList from two Touch objects");
+</script>
+</head>
+</body>
+</html>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/historical.html (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/historical.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/historical.html 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Historical touch events features</title>
+<script src=""
+<script src=""
+<script src=""
+<body>
+<script>
+test(function() {
+ assert_false("identifiedTouch" in TouchList.prototype,
+ "Should not be supported on the prototype");
+
+ var touchList = document.createTouchList();
+ assert_false("identifiedTouch" in touchList,
+ "Should not be supported on the instance");
+}, "TouchList::identifiedTouch");
+</script>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/multi-touch-interactions.js (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/multi-touch-interactions.js (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/multi-touch-interactions.js 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,371 @@
+setup({explicit_done: true});
+
+var debug = document.getElementById("debug");
+
+function debug_print (x) {
+/* uncomment below statement to show debug messages */
+// document.getElementById("debug").innerHTML += x;
+}
+
+var starting_elements = {};
+
+function check_list_subset_of_targetlist(list, list_name, targetlist, targetlist_name) {
+ var exist_in_targetlist;
+ for(i=0; i<list.length; i++) {
+ exist_in_targetlist=false;
+ for(j=0; j<targetlist.length; j++)
+ if(list.item(i).identifier==targetlist.item(j).identifier)
+ exist_in_targetlist=true;
+
+ assert_true(exist_in_targetlist, list_name + ".item("+i+") exists in " + targetlist_name);
+ }
+}
+
+function check_list_subset_of_two_targetlists(list, list_name, targetlist1, targetlist1_name, targetlist2, targetlist2_name) {
+ var exist_in_targetlists;
+ for(i=0; i<list.length; i++) {
+ exist_in_targetlists=false;
+ for(j=0; j<targetlist1.length; j++)
+ if(list.item(i).identifier==targetlist1.item(j).identifier)
+ exist_in_targetlists=true;
+
+ if(!exist_in_targetlists)
+ for(j=0; j<targetlist2.length; j++)
+ if(list.item(i).identifier==targetlist2.item(j).identifier)
+ exist_in_targetlists=true;
+
+ assert_true(exist_in_targetlists, list_name + ".item("+i+") exists in " + targetlist1_name + " or " + targetlist2_name);
+ }
+
+}
+
+function is_at_least_one_item_in_targetlist(list, targetlist) {
+ for(i=0; i<list.length; i++)
+ for(j=0; j<targetlist.length; j++)
+ if(list.item(i).identifier==targetlist.item(j).identifier)
+ return true;
+
+ return false;
+}
+
+function check_no_item_in_targetlist(list, list_name, targetlist, targetlist_name) {
+ for(i=0; i<list.length; i++)
+ for(j=0; j<targetlist.length; j++) {
+ assert_false(list.item(i).identifier==targetlist.item(j).identifier, list_name + ".item("+i+") exists in " + targetlist_name);
+ return;
+ }
+}
+
+function check_targets(list, target) {
+ for(i=0; i<list.length; i++)
+ assert_true(list.item(i).target==target, "item(" + i + ").target is element receiving event");
+}
+
+function check_starting_elements(list) {
+ for (i=0; i<list.length; i++) {
+ assert_equals(list.item(i).target, starting_elements[list.item(i).identifier], "item(" + i + ").target matches starting element");
+ }
+}
+
+function run() {
+ var target0 = document.getElementById("target0");
+ var target1 = document.getElementById("target1");
+
+ var test_touchstart = async_test("touchstart event received");
+ var test_touchmove = async_test("touchmove event received");
+ var test_touchend = async_test("touchend event received");
+ var test_mousedown = async_test("Interaction with mouse events");
+
+ var touchstart_received = 0;
+ var touchmove_received = 0;
+ var touchend_received = 0;
+ var touchstart_identifier;
+
+ // last received touch lists for comparison
+ var last_touches;
+ var last_targetTouches={};
+ var last_changedTouches={};
+
+ on_event(window, "touchstart", function onTouchStart(ev) {
+ // process event only if it's targeted at target0 or target1
+ if(ev.target != target0 && ev.target != target1 )
+ return;
+
+ ev.preventDefault();
+
+ if(!touchstart_received) {
+ // Check event ordering TA: 1.6.1
+ test_touchstart.step(function() {
+ assert_true(touchmove_received==0, "touchstart precedes touchmove");
+ assert_true(touchend_received==0, "touchstart precedes touchend");
+ });
+ test_touchstart.done();
+ test_mousedown.done(); // If we got here, then the mouse event test is not needed.
+ }
+ touchstart_received++;
+
+ // TA: 1.3.2.2, 1.3.2.4
+ test(function() {
+ assert_true(ev.changedTouches.length >= 1, "changedTouches.length is at least 1");
+ assert_true(ev.changedTouches.length <= ev.touches.length, "changedTouches.length is smaller than touches.length");
+ check_list_subset_of_targetlist(ev.changedTouches, "changedTouches", ev.touches, "touches");
+ }, "touchstart #" + touchstart_received + ": changedTouches is a subset of touches");
+
+ // TA: 1.3.3.2, 1.3.3.3
+ test(function() {
+ assert_true(ev.targetTouches.length >= 1, "targetTouches.length is at least 1");
+ assert_true(ev.targetTouches.length <= ev.touches.length, "targetTouches.length is smaller than touches.length");
+ check_list_subset_of_targetlist(ev.targetTouches, "targetTouches", ev.touches, "touches");
+ }, "touchstart #" + touchstart_received + ": targetTouches is a subset of touches");
+
+ // TA: 1.3.3.9
+ test(function() {
+ check_targets(ev.targetTouches, ev.target);
+ }, "touchstart #" + touchstart_received + ": targets of targetTouches are correct");
+
+ // TA: 1.3.4.2
+ test(function() {
+ assert_true(ev.touches.length >= 1, "touches.length is at least 1");
+ }, "touchstart #" + touchstart_received + ": touches.length is valid");
+
+ if(touchstart_received == 1) {
+ // TA: 1.3.3.5, 1.3.3.7
+ test(function() {
+ assert_true(ev.targetTouches.length <= ev.changedTouches.length, "targetTouches.length is smaller than changedTouches.length");
+ check_list_subset_of_targetlist(ev.targetTouches, "targetTouches", ev.changedTouches, "changedTouches");
+ }, "touchstart #" + touchstart_received + ": targetTouches is a subset of changedTouches");
+
+ // TA: 1.3.4.3
+ test(function() {
+ assert_true(ev.touches.length==ev.changedTouches.length, "touches and changedTouches have the same length");
+ }, "touchstart #" + touchstart_received + ": touches and changedTouches have the same length");
+ } else {
+ // TA: 1.3.3.6
+ test(function() {
+ var diff_in_targetTouches = ev.targetTouches.length - (last_targetTouches[ev.target.id] ? last_targetTouches[ev.target.id].length : 0);
+ assert_true(diff_in_targetTouches > 0, "targetTouches.length is larger than last received targetTouches.length");
+ assert_true(diff_in_targetTouches <= ev.changedTouches.length, "change in targetTouches.length is smaller than changedTouches.length");
+ }, "touchstart #" + touchstart_received + ": change in targetTouches.length is valid");
+
+ // TA: 1.3.3.8
+ test(function() {
+ assert_true(is_at_least_one_item_in_targetlist(ev.targetTouches, ev.changedTouches), "at least one item of targetTouches is in changedTouches");
+ }, "touchstart #" + touchstart_received + ": at least one targetTouches item in changedTouches");
+
+ // TA: 1.3.4.4
+ test(function() {
+ var diff_in_touches = ev.touches.length - last_touches.length;
+ assert_true(diff_in_touches > 0, "touches.length is larger than last received touches.length");
+ assert_true(diff_in_touches == ev.changedTouches.length, "change in touches.length equals changedTouches.length");
+ }, "touchstart #" + touchstart_received + ": change in touches.length is valid");
+
+ // TA: 1.3.4.5
+ test(function() {
+ check_list_subset_of_two_targetlists(ev.touches, "touches", ev.changedTouches, "changedTouches", last_touches, "last touches");
+ }, "touchstart #" + touchstart_received + ": touches is subset of {changedTouches, last received touches}");
+ }
+
+ // save starting element of each new touch point
+ for (i=0; i<ev.changedTouches.length; i++) {
+ starting_elements[ev.changedTouches.item(i).identifier] = ev.changedTouches.item(i).target;
+ }
+
+ last_touches = ev.touches;
+ last_targetTouches[ev.target.id] = ev.targetTouches;
+ last_changedTouches = {}; // changedTouches are only saved for touchend events
+ });
+
+ on_event(window, "touchmove", function onTouchMove(ev) {
+ // process event only if it's targeted at target0 or target1
+ if(ev.target != target0 && ev.target != target1 )
+ return;
+
+ ev.preventDefault();
+
+ // TA: 1.6.1
+ test_touchmove.step(function() {
+ assert_true(touchstart_received>0, "touchmove follows touchstart");
+ // assert_false(touchend_received, "touchmove precedes touchend"); // this applies to scenario tests
+ });
+ test_touchmove.done();
+
+ touchmove_received++;
+
+ // do the detailed checking only for a few times
+ if(touchmove_received<6) {
+ // TA: 1.4.2.2, 1.4.2.4
+ test(function() {
+ assert_true(ev.changedTouches.length >= 1, "changedTouches.length is at least 1");
+ assert_true(ev.changedTouches.length <= ev.touches.length, "changedTouches.length is smaller than touches.length");
+ check_list_subset_of_targetlist(ev.changedTouches, "changedTouches", ev.touches, "touches");
+ }, "touchmove #" + touchmove_received + ": changedTouches is a subset of touches");
+
+ // TA: 1.4.3.2, 1.4.3.4
+ test(function() {
+ assert_true(ev.targetTouches.length >= 1, "targetTouches.length is at least 1");
+ assert_true(ev.targetTouches.length <= ev.touches.length, "targetTouches.length is smaller than touches.length");
+ check_list_subset_of_targetlist(ev.targetTouches, "targetTouches", ev.touches, "touches");
+ }, "touchmove #" + touchmove_received + ": targetTouches is a subset of touches");
+
+ // TA: 1.4.3.6
+ test(function() {
+ assert_true(is_at_least_one_item_in_targetlist(ev.targetTouches, ev.changedTouches), "at least one item of targetTouches is in changedTouches");
+ }, "touchmove #" + touchmove_received + ": at least one targetTouches item in changedTouches");
+
+ // TA: 1.4.3.8
+ test(function() {
+ check_targets(ev.targetTouches, ev.target);
+ }, "touchmove #" + touchmove_received + ": targets of targetTouches are correct");
+
+ // TA: 1.4.4.2
+ test(function() {
+ assert_true(ev.touches.length==last_touches.length, "length of touches is same as length of last received touches");
+ check_list_subset_of_targetlist(ev.touches, "touches", last_touches, "last received touches");
+ }, "touchmove #" + touchmove_received + ": touches must be same as last received touches");
+
+ // TA: 1.6.3
+ check_starting_elements(ev.changedTouches);
+ }
+
+ last_touches = ev.touches;
+ last_targetTouches[ev.target.id] = ev.targetTouches;
+ last_changedTouches = {}; // changedTouches are only saved for touchend events
+ });
+
+ on_event(window, "touchend", function onTouchEnd(ev) {
+ // process event only if it's targeted at target0 or target1
+ if(ev.target != target0 && ev.target != target1 )
+ return;
+
+ test_touchend.step(function() {
+ assert_true(touchstart_received>0, "touchend follows touchstart");
+ });
+ test_touchend.done();
+
+ touchend_received++;
+
+ debug_print("touchend #" + touchend_received + ":<br>");
+ debug_print("changedTouches.length=" + ev.changedTouches.length + "<br>");
+ debug_print("targetTouches.length=" + ev.targetTouches.length + "<br>");
+ debug_print("touches.length=" + ev.touches.length + "<br>");
+ for(i=0; i<ev.changedTouches.length; i++)
+ debug_print("changedTouches.item(" + i + ").target=" + ev.changedTouches.item(i).target.id + "<br>");
+
+ // TA: 1.5.2.2
+ test(function() {
+ assert_true(ev.changedTouches.length >= 1, "changedTouches.length is at least 1");
+ }, "touchend #" + touchend_received + ": length of changedTouches is valid");
+
+ // TA: 1.5.2.3
+ test(function() {
+ check_list_subset_of_targetlist(ev.changedTouches, "changedTouches", last_touches, "last received touches");
+ }, "touchend #" + touchend_received + ": changedTouches is a subset of last received touches");
+
+ // TA: 1.5.2.4, 1.5.2.5
+ test(function() {
+ check_no_item_in_targetlist(ev.changedTouches, "changedTouches", ev.touches, "touches");
+ check_no_item_in_targetlist(ev.changedTouches, "changedTouches", ev.targetTouches, "targetTouches");
+ }, "touchend #" + touchend_received + ": no item in changedTouches are in touches or targetTouches");
+
+ // TA: 1.5.2.6
+ test(function() {
+ var found=false;
+ for (i=0; i<ev.changedTouches.length; i++)
+ if (ev.changedTouches.item(i).target == ev.target)
+ found=true;
+ assert_true(found, "at least one item in changedTouches has matching target");
+ }, "touchend #" + touchend_received + ": at least one item in changedTouches targeted at this element");
+
+ // TA: 1.5.3.2, 1.5.3.3
+ test(function() {
+ assert_true(ev.targetTouches.length >= 0, "targetTouches.length is non-negative");
+ assert_true(ev.targetTouches.length <= ev.touches.length, "targetTouches.length is smaller than touches.length");
+ check_list_subset_of_targetlist(ev.targetTouches, "targetTouches", ev.touches, "touches");
+ }, "touchend #" + touchend_received + ": targetTouches is a subset of touches");
+
+ // TA: 1.5.3.5 (new)
+ test(function() {
+ check_targets(ev.targetTouches, ev.target);
+ }, "touchend #" + touchend_received + ": targets of targetTouches are correct");
+
+ // In some cases, when multiple touch points are released simultaneously
+ // the UA would dispatch the "same" touchend event (same changedTouches, same touches, but possibly different targetTouches)
+ // to each of the elements that are starting elements of the released touch points.
+ // in these situations, the subsequent events are exempt from TA 1.5.3.4 and 1.5.4.2
+ var same_event_as_last = false;
+ if (last_changedTouches && last_changedTouches.length==ev.changedTouches.length) {
+ same_event_as_last = true; // assume true until proven otherwise
+ for (i=0; i<last_changedTouches.length; i++) {
+ var match = false;
+ for (j=0; j<ev.changedTouches.length; j++)
+ if (last_changedTouches.item(i) == ev.changedTouches.item(j)) {
+ match = true;
+ break;
+ }
+ if (!match)
+ same_event_as_last = false;
+ }
+ }
+
+ if (!same_event_as_last) {
+ // TA: 1.5.3.4
+ // Getting semi-random failures on this and 1.5.4.2.
+ // See 1.5.4.2. Not sure if it's the same issue...
+ test(function() {
+ assert_true(last_targetTouches[ev.target.id].length > 0, "last received targetTouches.length is not zero");
+ var diff_in_targetTouches = last_targetTouches[ev.target.id].length - ev.targetTouches.length;
+ debug_print("diff_in_targetTouches=" + diff_in_targetTouches + "<br>");
+ assert_true(diff_in_targetTouches > 0, "targetTouches.length is smaller than last received targetTouches.length");
+ assert_true(diff_in_targetTouches <= ev.changedTouches.length, "change in targetTouches.length is smaller than changedTouches.length");
+ }, "touchend #" + touchend_received + ": change in targetTouches.length is valid");
+
+ // TA: 1.5.4.2
+ // Getting semi-random failures on this and 1.5.3.4.
+ // It looks like if fingers are lifted simultaneously, the "same" touchend event can be dispatched to two target elements
+ // but adapted to the element (same touches, changedTouches but different targetTouches).
+ // When one event is processed after another, ev.touches would end up being identical to last_touches, leading to failure.
+ // Question is why done() does not stop the processing of the latter event.
+ test(function() {
+ assert_true(last_touches.length > 0, "last received touches.length is not zero");
+ var diff_in_touches = last_touches.length - ev.touches.length;
+ debug_print("diff_in_touches=" + diff_in_touches + "<br>");
+ assert_true(diff_in_touches > 0, "touches.length is smaller than last received touches.length");
+ assert_equals(diff_in_touches, ev.changedTouches.length, "change in touches.length equals changedTouches.length");
+ }, "touchend #" + touchend_received + ": change in touches.length is valid");
+ }
+
+ // TA: 1.6.4
+ debug_print("touchend #" + touchend_received + ": TA 1.6.4<br>");
+ test(function() {
+ check_starting_elements(ev.changedTouches);
+ }, "touchend #" + touchend_received + ": event dispatched to correct element<br>");
+
+ debug_print("touchend #" + touchend_received + ": saving touch lists<br>");
+
+ last_touches = ev.touches;
+ last_targetTouches[ev.target.id] = ev.targetTouches;
+ last_changedTouches = ev.changedTouches;
+
+ debug_print("touchend #" + touchend_received + ": done<br>");
+ if(ev.touches.length==0)
+ done();
+ });
+
+ on_event(target0, "mousedown", function onMouseDown(ev) {
+ test_mousedown.step(function() {
+ assert_true(touchstart_received,
+ "The touchstart event must be dispatched before any mouse " +
+ "events. (If this fails, it might mean that the user agent does " +
+ "not implement W3C touch events at all.)"
+ );
+ });
+ test_mousedown.done();
+
+ if (!touchstart_received) {
+ // Abort the tests. If touch events are not supported, then most of
+ // the other event handlers will never be called, and the test will
+ // time out with misleading results.
+ done();
+ }
+ });
+}
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-globaleventhandler-interface.html (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-globaleventhandler-interface.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-globaleventhandler-interface.html 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<title>GlobalEventHandlers Touch Interface Tests</title>
+<script src=""
+<script src=""
+<script>
+test(function() {
+ var touch_event_list = ['ontouchstart', 'ontouchmove', 'ontouchend', 'ontouchcancel'];
+ var global_event_handlers = [window, HTMLElement.prototype, SVGElement.prototype, Document.prototype];
+ for (var i in touch_event_list) {
+ for (var j in global_event_handlers) {
+ assert_true(touch_event_list[i] in global_event_handlers[j], "Touch event " + touch_event_list[i] + " in " + global_event_handlers[j].constructor.name);
+ }
+ }
+}, "Touch events in GlobalEventHandlers");
+
+test(function() {
+ var touch_event_list = ['ontouchstart', 'ontouchmove', 'ontouchend', 'ontouchcancel'];
+ var global_event_handlers = [window, HTMLElement.prototype, SVGElement.prototype, Document.prototype];
+ for (var i in touch_event_list) {
+ for (var j in global_event_handlers) {
+ assert_true(global_event_handlers[j].hasOwnProperty(touch_event_list[i]), "GlobalEventHandler " + global_event_handlers[j].constructor.name + " hasOwnProperty " + touch_event_list[i]);
+ }
+ }
+}, "Touch events are GlobalEventHandlers' own property");
+
+test(function() {
+ var touch_event_list = ['ontouchstart', 'ontouchmove', 'ontouchend', 'ontouchcancel'];
+ var non_global_event_handlers = [Element.prototype];
+ for (var i in touch_event_list) {
+ for (var j in non_global_event_handlers) {
+ assert_false(touch_event_list[i] in non_global_event_handlers[j], "Touch event " + touch_event_list[i] + " not in " + non_global_event_handlers[j].constructor.name);
+ }
+ }
+}, "Touch events not in Element.prototype");
+</script>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-support.js (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-support.js (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-support.js 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,106 @@
+// Check a Touch object's attributes for existence and correct type
+// TA: 1.1.2, 1.1.3
+function check_Touch_object(t) {
+ assert_equals(Object.prototype.toString.call(t), "[object Touch]", "touch is of type Touch");
+ [
+ ["long", "identifier"],
+ ["EventTarget", "target"],
+ ["long", "screenX"],
+ ["long", "screenY"],
+ ["long", "clientX"],
+ ["long", "clientY"],
+ ["long", "pageX"],
+ ["long", "pageY"],
+ ["long", "radiusX"],
+ ["long", "radiusY"],
+ ["long", "rotationAngle"],
+ ["long", "force"],
+ ].forEach(function(attr) {
+ var type = attr[0];
+ var name = attr[1];
+
+ // existence check
+ assert_true(name in t, name + " attribute in Touch object");
+
+ // type check
+ switch (type) {
+ case "long":
+ assert_equals(typeof t[name], "number", name + " attribute of type long");
+ break;
+ case "EventTarget":
+ // An event target is some type of Element
+ assert_true(t[name] instanceof Element, "EventTarget must be an Element.");
+ break;
+ default:
+ break;
+ }
+ });
+}
+
+// Check a TouchList object's attributes and methods for existence and proper type
+// Also make sure all of the members of the list are Touch objects
+// TA: 1.2.1, 1.2.2, 1.2.5, 1.2.6
+function check_TouchList_object(tl) {
+ assert_equals(Object.prototype.toString.call(tl), "[object TouchList]", "touch list is of type TouchList");
+ [
+ ["unsigned long", "length"],
+ ["function", "item"],
+ ].forEach(function(attr) {
+ var type = attr[0];
+ var name = attr[1];
+
+ // existence check
+ assert_true(name in tl, name + " attribute in TouchList");
+
+ // type check
+ switch (type) {
+ case "unsigned long":
+ assert_equals(typeof tl[name], "number", name + " attribute of type long");
+ break;
+ case "function":
+ assert_equals(typeof tl[name], "function", name + " attribute of type function");
+ break;
+ default:
+ break;
+ }
+ });
+ // Each member of tl should be a proper Touch object
+ for (var i = 0; i < tl.length; i++) {
+ check_Touch_object(tl.item(i));
+ }
+ // TouchList.item(x) should return null if x is >= TouchList.length
+ var t = tl.item(tl.length);
+ assert_equals(t, null, "TouchList.item returns null if the index is >= the length of the list");
+}
+
+// Check a TouchEvent event's attributes for existence and proper type
+// Also check that each of the event's TouchList objects are valid
+// TA: 1.{3,4,5}.1.1, 1.{3,4,5}.1.2
+function check_TouchEvent(ev) {
+ assert_true(ev instanceof TouchEvent, ev.type + " event is a TouchEvent event");
+ [
+ ["TouchList", "touches"],
+ ["TouchList", "targetTouches"],
+ ["TouchList", "changedTouches"],
+ ["boolean", "altKey"],
+ ["boolean", "metaKey"],
+ ["boolean", "ctrlKey"],
+ ["boolean", "shiftKey"],
+ ].forEach(function(attr) {
+ var type = attr[0];
+ var name = attr[1];
+ // existence check
+ assert_true(name in ev, name + " attribute in " + ev.type + " event");
+ // type check
+ switch (type) {
+ case "boolean":
+ assert_equals(typeof ev[name], "boolean", name + " attribute of type boolean");
+ break;
+ case "TouchList":
+ assert_equals(Object.prototype.toString.call(ev[name]), "[object TouchList]", name + " attribute of type TouchList");
+ break;
+ default:
+ break;
+ }
+ });
+}
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-touchevent-constructor.html (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-touchevent-constructor.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-touchevent-constructor.html 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,116 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Touch and TouchEvent Constructor Tests</title>
+<script src=""
+<script src=""
+<script src=""
+</head>
+<body>
+<div id="target0"></div>
+<script>
+test(function() {
+ assert_throws(new TypeError(), function() {new Touch();}, "Touch constructor requires initialize dictionary");
+ assert_throws(new TypeError(), function() {new Touch({});}, "Touch constructor requires identifier and target");
+}, "Create a Touch object with insufficient properties");
+
+test(function() {
+ var testIdentifier = 74;
+ var testTarget = document.getElementById('target0');
+ var approxEpsilon = 0.00001;
+
+ var touch1 = new Touch({
+ identifier: testIdentifier,
+ target: testTarget,
+ });
+ check_Touch_object(touch1);
+ assert_equals(touch1.target, testTarget, "touch.target is requested value");
+ assert_equals(touch1.identifier, testIdentifier, "touch.identifier is requested value");
+ assert_approx_equals(touch1.pageX, 0, approxEpsilon, "touch.pageX is default value");
+ assert_approx_equals(touch1.pageY, 0, approxEpsilon, "touch.pageY is default value");
+ assert_approx_equals(touch1.screenX, 0, approxEpsilon, "touch.screenX is default value");
+ assert_approx_equals(touch1.screenY, 0, approxEpsilon, "touch.screenY is default value");
+ assert_approx_equals(touch1.clientX, 0, approxEpsilon, "touch.clientX is default value.");
+ assert_approx_equals(touch1.clientY, 0, approxEpsilon, "touch.clientY is default value.");
+}, "Touch constructor exists and creates a Touch object with minimum properties");
+
+test(function() {
+ var testIdentifier = 42;
+ var testTarget = document.getElementById('target0');
+ var testPageX = 15;
+ var testPageY = 20.2;
+ var testScreenX = 35.34;
+ var testScreenY = 40.56;
+ var testClientX = 10.175;
+ var testClientY = 5;
+ var approxEpsilon = 0.00001;
+
+ var touch1 = new Touch({
+ identifier: testIdentifier,
+ target: testTarget,
+ pageX: testPageX,
+ pageY: testPageY,
+ screenX: testScreenX,
+ screenY: testScreenY,
+ clientX: testClientX,
+ clientY: testClientY,
+ });
+ check_Touch_object(touch1);
+ assert_equals(touch1.identifier, testIdentifier, "touch.identifier is requested value");
+ assert_equals(touch1.target, testTarget, "touch.target is requested value");
+ assert_approx_equals(touch1.pageX, testPageX, approxEpsilon, "touch.pageX is requested value");
+ assert_approx_equals(touch1.pageY, testPageY, approxEpsilon, "touch.pageY is requested value");
+ assert_approx_equals(touch1.screenX, testScreenX, approxEpsilon, "touch.screenX is requested value");
+ assert_approx_equals(touch1.screenY, testScreenY, approxEpsilon, "touch.screenY is requested value");
+ assert_approx_equals(touch1.clientX, testClientX, approxEpsilon, "touch.clientX is requested value.");
+ assert_approx_equals(touch1.clientY, testClientY, approxEpsilon, "touch.clientY is requested value.");
+}, "Touch constructor exists and creates a Touch object with requested properties");
+
+
+test(function() {
+ var testTarget = document.getElementById('target0');
+
+ var touch1 = new Touch({
+ identifier: 45,
+ target: testTarget,
+ pageX: 45,
+ pageY: 50,
+ screenX: 65,
+ screenY: 60,
+ clientX: 70,
+ clientY: 75,
+ });
+ var touch2 = new Touch({
+ identifier: 52,
+ target: testTarget,
+ pageX: 15,
+ pageY: 20,
+ screenX: 15,
+ screenY: 20,
+ clientX: 15,
+ clientY: 20,
+ });
+
+ var touchEvent1 = new TouchEvent("ontouchstart", {
+ touches: [touch1, touch2],
+ targetTouches: [touch1],
+ altKey: true,
+ metaKey: false,
+ });
+
+ check_TouchEvent(touchEvent1);
+ assert_equals(touchEvent1.type, "ontouchstart", "touchEvent.type is requested value");
+ assert_equals(touchEvent1.touches.length, 2, "touchEvent.touches.length is requested value");
+ assert_equals(touchEvent1.touches[0], touch1, "touchEvent.touches[0] is requested value");
+ assert_equals(touchEvent1.touches[1], touch2, "touchEvent.touches[1] is requested value");
+ assert_equals(touchEvent1.targetTouches.length, 1, "touchEvent.targetTouches.length is requested value");
+ assert_equals(touchEvent1.targetTouches[0], touch1, "touchEvent.targetTouches[0] is requested value");
+ assert_equals(touchEvent1.changedTouches.length, 0, "touchEvent.changedTouches.length is requested value");
+ assert_equals(touchEvent1.altKey, true, "touchEvent.altKey is requested value");
+ assert_equals(touchEvent1.metaKey, false, "touchEvent.metaKey is requested value");
+ assert_equals(touchEvent1.ctrlKey, false, "touchEvent.ctrlKey is requested value");
+ assert_equals(touchEvent1.shiftKey, false, "touchEvent.shiftKey is requested value.");
+}, "TouchEvent constructor exists and creates a TouchEvent object with requested properties");
+</script>
+</body>
+</html>
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/w3c-import.log (0 => 206576)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/w3c-import.log (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/touch-events/w3c-import.log 2016-09-29 04:44:24 UTC (rev 206576)
@@ -0,0 +1,24 @@
+The tests in this directory were imported from the W3C repository.
+Do NOT modify these tests directly in WebKit.
+Instead, create a pull request on the W3C CSS or WPT github:
+ https://github.com/w3c/csswg-test
+ https://github.com/w3c/web-platform-tests
+
+Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
+
+Do NOT modify or remove this file.
+
+------------------------------------------------------------------------
+Properties requiring vendor prefixes:
+None
+Property values requiring vendor prefixes:
+None
+------------------------------------------------------------------------
+List of files:
+/LayoutTests/imported/w3c/web-platform-tests/touch-events/OWNERS
+/LayoutTests/imported/w3c/web-platform-tests/touch-events/create-touch-touchlist.html
+/LayoutTests/imported/w3c/web-platform-tests/touch-events/historical.html
+/LayoutTests/imported/w3c/web-platform-tests/touch-events/multi-touch-interactions.js
+/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-globaleventhandler-interface.html
+/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-support.js
+/LayoutTests/imported/w3c/web-platform-tests/touch-events/touch-touchevent-constructor.html
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (206575 => 206576)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-09-29 03:58:33 UTC (rev 206575)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-09-29 04:44:24 UTC (rev 206576)
@@ -134,12 +134,15 @@
imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements
# No touch events
+fast/events/touch [ Skip ]
fast/shadow-dom/touch-event-ios.html [ Skip ]
+imported/w3c/web-platform-tests/touch-events [ Skip ]
platform/ios-simulator/ios/fast/forms/range-input-container-touches.html [ Skip ]
platform/ios-simulator/ios/fast/forms/range-input-readonly-and-disabled.html [ Skip ]
platform/ios-simulator/ios/fast/forms/range-input-touches.html [ Skip ]
platform/ios-simulator/ios/fast/text/data-detectors/phone-disabled.html [ Skip ]
platform/ios-simulator/ios/fast/text/data-detectors/phone.html [ Skip ]
+platform/ios-simulator/ios/touch [ Skip ]
# WebKitDataCue is supported, not DataCue
media/track/track-datacue.html
@@ -285,8 +288,6 @@
# AutoFill button is not supported
fast/forms/auto-fill-button/mouse-down-input-mouse-release-auto-fill-button.html
-fast/events/touch [ Skip ]
-
# Mouse events are not supported on iOS
fast/scrolling/arrow-key-scroll-in-rtl-document.html [ Skip ]
fast/scrolling/overflow-scroll-past-max.html [ Skip ]
@@ -2053,7 +2054,6 @@
platform/ios-simulator/ios/fixed/four-bars.html [ Failure ]
platform/ios-simulator/ios/fixed/nested-fixed.html [ Failure ]
platform/ios-simulator/ios/fixed/percentage-inside-fixed.html [ Failure ]
-platform/ios-simulator/ios/touch [ Skip ]
# image inputs get rounded corners on iOS
fast/css/object-position/object-position-input-image.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (206575 => 206576)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-09-29 03:58:33 UTC (rev 206575)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-09-29 04:44:24 UTC (rev 206576)
@@ -64,6 +64,7 @@
# These tests require touch support
fast/events/touch [ Skip ]
+imported/w3c/web-platform-tests/touch-events [ Skip ]
# No button tracked
fast/events/mouseover-button.html
Modified: trunk/LayoutTests/platform/win/TestExpectations (206575 => 206576)
--- trunk/LayoutTests/platform/win/TestExpectations 2016-09-29 03:58:33 UTC (rev 206575)
+++ trunk/LayoutTests/platform/win/TestExpectations 2016-09-29 04:44:24 UTC (rev 206576)
@@ -202,6 +202,7 @@
# These tests require touch support
fast/events/touch/ [ Skip ]
+imported/w3c/web-platform-tests/touch-events/ [ Skip ]
# TODO No support for key event location in EventSender.
webkit.org/b/140526 [ Release ] fast/events/keydown-numpad-keys.html [ Failure ]
