[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
benm at google.com
benm at google.com
Fri Feb 26 22:21:04 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit e9286db42bc2d72618e0ff8c8bcb8a55d4ff81c4
Author: benm at google.com <benm at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 16 11:18:30 2010 +0000
Refactor and split up basic-touch-events test
https://bugs.webkit.org/show_bug.cgi?id=34476
Reviewed by Simon Hausmann.
Split the basic-touch-events test into two separate tests, one for single and another for multi touch. Also refactor the tests to run in an asynchronous manner.
* fast/events/touch/basic-multi-touch-events.html: Copied from LayoutTests/fast/events/touch/basic-touch-events.html. Tests the same multi touch tests cases from the old basic-touch-events test.
* fast/events/touch/basic-multi-touch-events-expected.txt: Added.
* fast/events/touch/script-tests/basic-multi-touch-events.js: Added.
* fast/events/touch/basic-single-touch-events.html: Copied from LayoutTests/fast/events/touch/basic-touch-events.html. Tests the same single touch tests cases from the old basic-touch-events test.
* fast/events/touch/script-tests/basic-single-touch-events.js: Added.
* fast/events/touch/basic-single-touch-events-expected.txt: Added.
* fast/events/touch/basic-touch-events.html: Removed.
* fast/events/touch/script-tests/basic-touch-events.js: Removed.
* fast/events/touch/basic-touch-events-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54817 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3f3137a..2fff5e0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-02-16 Ben Murdoch <benm at google.com>
+
+ Reviewed by Simon Hausmann.
+
+ Refactor and split up basic-touch-events test
+ https://bugs.webkit.org/show_bug.cgi?id=34476
+
+ Split the basic-touch-events test into two separate tests, one for single and another for multi touch. Also refactor the tests to run in an asynchronous manner.
+
+ * fast/events/touch/basic-multi-touch-events.html: Copied from LayoutTests/fast/events/touch/basic-touch-events.html. Tests the same multi touch tests cases from the old basic-touch-events test.
+ * fast/events/touch/basic-multi-touch-events-expected.txt: Added.
+ * fast/events/touch/script-tests/basic-multi-touch-events.js: Added.
+ * fast/events/touch/basic-single-touch-events.html: Copied from LayoutTests/fast/events/touch/basic-touch-events.html. Tests the same single touch tests cases from the old basic-touch-events test.
+ * fast/events/touch/script-tests/basic-single-touch-events.js: Added.
+ * fast/events/touch/basic-single-touch-events-expected.txt: Added.
+ * fast/events/touch/basic-touch-events.html: Removed.
+ * fast/events/touch/script-tests/basic-touch-events.js: Removed.
+ * fast/events/touch/basic-touch-events-expected.txt: Removed.
+
2010-02-15 Dan Bernstein <mitz at apple.com>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/events/touch/basic-multi-touch-events-expected.txt b/LayoutTests/fast/events/touch/basic-multi-touch-events-expected.txt
new file mode 100644
index 0000000..67db8dc
--- /dev/null
+++ b/LayoutTests/fast/events/touch/basic-multi-touch-events-expected.txt
@@ -0,0 +1,95 @@
+This tests basic multi touch event support.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+multi touch sequence
+Two touchpoints pressed
+PASS lastEvent.type is "touchstart"
+PASS lastEvent.touches.length is 2
+PASS lastEvent.changedTouches.length is 2
+PASS lastEvent.targetTouches.length is 2
+PASS lastEvent.touches[0].pageX is 10
+PASS lastEvent.touches[0].pageY is 10
+PASS lastEvent.touches[0].clientX is 10
+PASS lastEvent.touches[0].clientY is 10
+PASS lastEvent.touches[0].identifier is 0
+PASS lastEvent.touches[1].pageX is 20
+PASS lastEvent.touches[1].pageY is 30
+PASS lastEvent.touches[1].clientX is 20
+PASS lastEvent.touches[1].clientY is 30
+PASS lastEvent.touches[1].identifier is 1
+PASS lastEvent.changedTouches[0].pageX is 10
+PASS lastEvent.changedTouches[0].pageY is 10
+PASS lastEvent.changedTouches[0].clientX is 10
+PASS lastEvent.changedTouches[0].clientY is 10
+PASS lastEvent.changedTouches[0].identifier is 0
+PASS lastEvent.changedTouches[1].pageX is 20
+PASS lastEvent.changedTouches[1].pageY is 30
+PASS lastEvent.changedTouches[1].clientX is 20
+PASS lastEvent.changedTouches[1].clientY is 30
+PASS lastEvent.changedTouches[1].identifier is 1
+PASS lastEvent.targetTouches[0].pageX is 10
+PASS lastEvent.targetTouches[0].pageY is 10
+PASS lastEvent.targetTouches[0].clientX is 10
+PASS lastEvent.targetTouches[0].clientY is 10
+PASS lastEvent.targetTouches[0].identifier is 0
+PASS lastEvent.targetTouches[1].pageX is 20
+PASS lastEvent.targetTouches[1].pageY is 30
+PASS lastEvent.targetTouches[1].clientX is 20
+PASS lastEvent.targetTouches[1].clientY is 30
+PASS lastEvent.targetTouches[1].identifier is 1
+First touchpoint moved
+PASS lastEvent.type is "touchmove"
+PASS lastEvent.touches.length is 2
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 2
+PASS lastEvent.touches[0].pageX is 15
+PASS lastEvent.touches[0].pageY is 15
+PASS lastEvent.touches[0].clientX is 15
+PASS lastEvent.touches[0].clientY is 15
+PASS lastEvent.touches[0].identifier is 0
+PASS lastEvent.changedTouches[0].pageX is 15
+PASS lastEvent.changedTouches[0].pageY is 15
+PASS lastEvent.changedTouches[0].clientX is 15
+PASS lastEvent.changedTouches[0].clientY is 15
+PASS lastEvent.changedTouches[0].identifier is 0
+PASS lastEvent.touches[1].pageX is 20
+PASS lastEvent.touches[1].pageY is 30
+PASS lastEvent.touches[1].clientX is 20
+PASS lastEvent.touches[1].clientY is 30
+PASS lastEvent.touches[1].identifier is 1
+First touchpoint is released
+PASS lastEvent.type is "touchend"
+PASS lastEvent.touches.length is 1
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 1
+PASS lastEvent.touches[0].pageX is 20
+PASS lastEvent.touches[0].pageY is 30
+PASS lastEvent.touches[0].clientX is 20
+PASS lastEvent.touches[0].clientY is 30
+PASS lastEvent.touches[0].identifier is 1
+PASS lastEvent.changedTouches[0].pageX is 15
+PASS lastEvent.changedTouches[0].pageY is 15
+PASS lastEvent.changedTouches[0].clientX is 15
+PASS lastEvent.changedTouches[0].clientY is 15
+PASS lastEvent.changedTouches[0].identifier is 0
+PASS lastEvent.targetTouches[0].pageX is 20
+PASS lastEvent.targetTouches[0].pageY is 30
+PASS lastEvent.targetTouches[0].clientX is 20
+PASS lastEvent.targetTouches[0].clientY is 30
+PASS lastEvent.targetTouches[0].identifier is 1
+Last remaining touchpoint is released
+PASS lastEvent.type is "touchend"
+PASS lastEvent.touches.length is 0
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 0
+PASS lastEvent.changedTouches[0].pageX is 20
+PASS lastEvent.changedTouches[0].pageY is 30
+PASS lastEvent.changedTouches[0].clientX is 20
+PASS lastEvent.changedTouches[0].clientY is 30
+PASS lastEvent.changedTouches[0].identifier is 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/events/touch/basic-multi-touch-events.html b/LayoutTests/fast/events/touch/basic-multi-touch-events.html
new file mode 100644
index 0000000..951e169
--- /dev/null
+++ b/LayoutTests/fast/events/touch/basic-multi-touch-events.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../js/resources/js-test-post-function.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/basic-multi-touch-events.js"></script>
+
+</body>
+</html>
diff --git a/LayoutTests/fast/events/touch/basic-single-touch-events-expected.txt b/LayoutTests/fast/events/touch/basic-single-touch-events-expected.txt
new file mode 100644
index 0000000..634faa1
--- /dev/null
+++ b/LayoutTests/fast/events/touch/basic-single-touch-events-expected.txt
@@ -0,0 +1,64 @@
+This tests basic single touch event support.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS lastEvent.type is "touchstart"
+PASS lastEvent.touches.length is 1
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 1
+PASS lastEvent.shiftKey is false
+PASS lastEvent.touches[0].target.id is "touchtarget"
+PASS lastEvent.touches[0].pageX is 10
+PASS lastEvent.touches[0].pageY is 10
+PASS lastEvent.touches[0].clientX is 10
+PASS lastEvent.touches[0].clientY is 10
+PASS lastEvent.touches[0].identifier is 0
+PASS lastEvent.changedTouches[0].pageX is 10
+PASS lastEvent.changedTouches[0].pageY is 10
+PASS lastEvent.changedTouches[0].clientX is 10
+PASS lastEvent.changedTouches[0].clientY is 10
+PASS lastEvent.changedTouches[0].identifier is 0
+PASS lastEvent.targetTouches[0].pageX is 10
+PASS lastEvent.targetTouches[0].pageY is 10
+PASS lastEvent.targetTouches[0].clientX is 10
+PASS lastEvent.targetTouches[0].clientY is 10
+PASS lastEvent.targetTouches[0].identifier is 0
+PASS lastEvent.type is "touchmove"
+PASS lastEvent.touches.length is 1
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 1
+PASS lastEvent.touches[0].pageX is 20
+PASS lastEvent.touches[0].pageY is 15
+PASS lastEvent.touches[0].clientX is 20
+PASS lastEvent.touches[0].clientY is 15
+PASS lastEvent.touches[0].identifier is 0
+PASS lastEvent.shiftKey is true
+PASS lastEvent.altKey is true
+PASS lastEvent.ctrlKey is false
+PASS lastEvent.metaKey is false
+PASS lastEvent.type is "touchend"
+PASS lastEvent.touches.length is 0
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 0
+PASS lastEvent.changedTouches[0].pageX is 20
+PASS lastEvent.changedTouches[0].pageY is 15
+PASS lastEvent.changedTouches[0].clientX is 20
+PASS lastEvent.changedTouches[0].clientY is 15
+PASS lastEvent.changedTouches[0].identifier is 0
+PASS lastEvent.shiftKey is false
+PASS lastEvent.altKey is false
+PASS lastEvent.type is "touchstart"
+PASS lastEvent.touches.length is 1
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 1
+PASS lastEvent.targetTouches[0].target.tagName is "DIV"
+PASS lastEvent.type is "touchmove"
+PASS lastEvent.touches.length is 1
+PASS lastEvent.changedTouches.length is 1
+PASS lastEvent.targetTouches.length is 0
+PASS lastEvent.touches[0].target.tagName is "HTML"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/events/touch/basic-single-touch-events.html b/LayoutTests/fast/events/touch/basic-single-touch-events.html
new file mode 100644
index 0000000..4f870f4
--- /dev/null
+++ b/LayoutTests/fast/events/touch/basic-single-touch-events.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script src="../../js/resources/js-test-pre.js"></script>
+<script src="../../js/resources/js-test-post-function.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/basic-single-touch-events.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/events/touch/basic-touch-events-expected.txt b/LayoutTests/fast/events/touch/basic-touch-events-expected.txt
deleted file mode 100644
index 7ae4527..0000000
--- a/LayoutTests/fast/events/touch/basic-touch-events-expected.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-This tests basic touch event support.
-single touch sequence
-PASS lastEvent.type is "touchstart"
-PASS lastEvent.touches.length is 1
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 1
-PASS lastEvent.shiftKey is false
-PASS lastEvent.touches[0].target.id is "touchtarget"
-PASS lastEvent.touches[0].pageX is 10
-PASS lastEvent.touches[0].pageY is 10
-PASS lastEvent.touches[0].clientX is 10
-PASS lastEvent.touches[0].clientY is 10
-PASS lastEvent.touches[0].identifier is 0
-PASS lastEvent.changedTouches[0].pageX is 10
-PASS lastEvent.changedTouches[0].pageY is 10
-PASS lastEvent.changedTouches[0].clientX is 10
-PASS lastEvent.changedTouches[0].clientY is 10
-PASS lastEvent.changedTouches[0].identifier is 0
-PASS lastEvent.targetTouches[0].pageX is 10
-PASS lastEvent.targetTouches[0].pageY is 10
-PASS lastEvent.targetTouches[0].clientX is 10
-PASS lastEvent.targetTouches[0].clientY is 10
-PASS lastEvent.targetTouches[0].identifier is 0
-PASS lastEvent.type is "touchmove"
-PASS lastEvent.touches.length is 1
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 1
-PASS lastEvent.touches[0].pageX is 20
-PASS lastEvent.touches[0].pageY is 15
-PASS lastEvent.touches[0].clientX is 20
-PASS lastEvent.touches[0].clientY is 15
-PASS lastEvent.touches[0].identifier is 0
-PASS lastEvent.shiftKey is true
-PASS lastEvent.altKey is true
-PASS lastEvent.ctrlKey is false
-PASS lastEvent.metaKey is false
-PASS lastEvent.type is "touchend"
-PASS lastEvent.touches.length is 0
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 0
-PASS lastEvent.changedTouches[0].pageX is 20
-PASS lastEvent.changedTouches[0].pageY is 15
-PASS lastEvent.changedTouches[0].clientX is 20
-PASS lastEvent.changedTouches[0].clientY is 15
-PASS lastEvent.changedTouches[0].identifier is 0
-PASS lastEvent.shiftKey is false
-PASS lastEvent.altKey is false
-multi touch sequence
-Two touchpoints pressed
-PASS lastEvent.type is "touchstart"
-PASS lastEvent.touches.length is 2
-PASS lastEvent.changedTouches.length is 2
-PASS lastEvent.targetTouches.length is 2
-PASS lastEvent.touches[0].pageX is 10
-PASS lastEvent.touches[0].pageY is 10
-PASS lastEvent.touches[0].clientX is 10
-PASS lastEvent.touches[0].clientY is 10
-PASS lastEvent.touches[0].identifier is 0
-PASS lastEvent.touches[1].pageX is 20
-PASS lastEvent.touches[1].pageY is 30
-PASS lastEvent.touches[1].clientX is 20
-PASS lastEvent.touches[1].clientY is 30
-PASS lastEvent.touches[1].identifier is 1
-PASS lastEvent.changedTouches[0].pageX is 10
-PASS lastEvent.changedTouches[0].pageY is 10
-PASS lastEvent.changedTouches[0].clientX is 10
-PASS lastEvent.changedTouches[0].clientY is 10
-PASS lastEvent.changedTouches[0].identifier is 0
-PASS lastEvent.changedTouches[1].pageX is 20
-PASS lastEvent.changedTouches[1].pageY is 30
-PASS lastEvent.changedTouches[1].clientX is 20
-PASS lastEvent.changedTouches[1].clientY is 30
-PASS lastEvent.changedTouches[1].identifier is 1
-PASS lastEvent.targetTouches[0].pageX is 10
-PASS lastEvent.targetTouches[0].pageY is 10
-PASS lastEvent.targetTouches[0].clientX is 10
-PASS lastEvent.targetTouches[0].clientY is 10
-PASS lastEvent.targetTouches[0].identifier is 0
-PASS lastEvent.targetTouches[1].pageX is 20
-PASS lastEvent.targetTouches[1].pageY is 30
-PASS lastEvent.targetTouches[1].clientX is 20
-PASS lastEvent.targetTouches[1].clientY is 30
-PASS lastEvent.targetTouches[1].identifier is 1
-First touchpoint moved
-PASS lastEvent.type is "touchmove"
-PASS lastEvent.touches.length is 2
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 2
-PASS lastEvent.touches[0].pageX is 15
-PASS lastEvent.touches[0].pageY is 15
-PASS lastEvent.touches[0].clientX is 15
-PASS lastEvent.touches[0].clientY is 15
-PASS lastEvent.touches[0].identifier is 0
-PASS lastEvent.changedTouches[0].pageX is 15
-PASS lastEvent.changedTouches[0].pageY is 15
-PASS lastEvent.changedTouches[0].clientX is 15
-PASS lastEvent.changedTouches[0].clientY is 15
-PASS lastEvent.changedTouches[0].identifier is 0
-PASS lastEvent.touches[1].pageX is 20
-PASS lastEvent.touches[1].pageY is 30
-PASS lastEvent.touches[1].clientX is 20
-PASS lastEvent.touches[1].clientY is 30
-PASS lastEvent.touches[1].identifier is 1
-First touchpoint is released
-PASS lastEvent.type is "touchend"
-PASS lastEvent.touches.length is 1
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 1
-PASS lastEvent.touches[0].pageX is 20
-PASS lastEvent.touches[0].pageY is 30
-PASS lastEvent.touches[0].clientX is 20
-PASS lastEvent.touches[0].clientY is 30
-PASS lastEvent.touches[0].identifier is 1
-PASS lastEvent.changedTouches[0].pageX is 15
-PASS lastEvent.changedTouches[0].pageY is 15
-PASS lastEvent.changedTouches[0].clientX is 15
-PASS lastEvent.changedTouches[0].clientY is 15
-PASS lastEvent.changedTouches[0].identifier is 0
-PASS lastEvent.targetTouches[0].pageX is 20
-PASS lastEvent.targetTouches[0].pageY is 30
-PASS lastEvent.targetTouches[0].clientX is 20
-PASS lastEvent.targetTouches[0].clientY is 30
-PASS lastEvent.targetTouches[0].identifier is 1
-Last remaining touchpoint is released
-PASS lastEvent.type is "touchend"
-PASS lastEvent.touches.length is 0
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 0
-PASS lastEvent.changedTouches[0].pageX is 20
-PASS lastEvent.changedTouches[0].pageY is 30
-PASS lastEvent.changedTouches[0].clientX is 20
-PASS lastEvent.changedTouches[0].clientY is 30
-PASS lastEvent.changedTouches[0].identifier is 1
-verify touch targets
-PASS lastEvent.type is "touchstart"
-PASS lastEvent.touches.length is 1
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 1
-PASS lastEvent.targetTouches[0].target.tagName is "DIV"
-PASS lastEvent.type is "touchmove"
-PASS lastEvent.touches.length is 1
-PASS lastEvent.changedTouches.length is 1
-PASS lastEvent.targetTouches.length is 0
-PASS lastEvent.touches[0].target.tagName is "HTML"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/touch/basic-touch-events.html b/LayoutTests/fast/events/touch/basic-touch-events.html
deleted file mode 100644
index c50c6fc..0000000
--- a/LayoutTests/fast/events/touch/basic-touch-events.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../js/resources/js-test-style.css">
-<script src="../../js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/basic-touch-events.js"></script>
-<script src="../../js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/events/touch/script-tests/basic-multi-touch-events.js b/LayoutTests/fast/events/touch/script-tests/basic-multi-touch-events.js
new file mode 100644
index 0000000..abfaf90
--- /dev/null
+++ b/LayoutTests/fast/events/touch/script-tests/basic-multi-touch-events.js
@@ -0,0 +1,115 @@
+var div = document.createElement("div");
+div.id = "touchtarget";
+div.style.width = "100px";
+div.style.height = "100px";
+div.style.backgroundColor = "blue";
+
+var lastEvent = null;
+var touchEventsReceived = 0;
+var EXPECTED_TOUCH_EVENTS_TOTAL = 4;
+
+function touchEventCallback() {
+ if (window.eventSender) {
+ lastEvent = event;
+ verifyTouch(touchEventsReceived++);
+ } else {
+ debug(event.type);
+ }
+
+ if (window.layoutTestController && touchEventsReceived == EXPECTED_TOUCH_EVENTS_TOTAL) {
+ // If we've got here, we can safely say we were successfully parsed :) We need to
+ // call the isSucccessfullyParsed function to output the correct TEST COMPLETE
+ // footer message.
+ successfullyParsed = true;
+ isSuccessfullyParsed();
+ layoutTestController.notifyDone();
+ }
+}
+
+div.addEventListener("touchstart", touchEventCallback, false);
+div.addEventListener("touchmove", touchEventCallback, false);
+div.addEventListener("touchend", touchEventCallback, false);
+document.body.insertBefore(div, document.body.firstChild);
+
+function verifyTouchEvent(type, totalTouchCount, changedTouchCount, targetTouchCount)
+{
+ shouldBeEqualToString("lastEvent.type", type);
+ shouldBe("lastEvent.touches.length", totalTouchCount.toString());
+ shouldBe("lastEvent.changedTouches.length", changedTouchCount.toString());
+ shouldBe("lastEvent.targetTouches.length", targetTouchCount.toString());
+}
+
+function verifyTouchPoint(list, point, x, y, id)
+{
+ shouldBe("lastEvent." + list + "[" + point + "].pageX", x.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].pageY", y.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].clientX", x.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].clientY", y.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].identifier", id.toString());
+}
+
+function verifyTouch(which) {
+ switch (which) {
+ case 0:
+ verifyTouchEvent("touchstart", 2, 2, 2);
+ verifyTouchPoint("touches", 0, 10, 10, 0);
+ verifyTouchPoint("touches", 1, 20, 30, 1);
+ verifyTouchPoint("changedTouches", 0, 10, 10, 0);
+ verifyTouchPoint("changedTouches", 1, 20, 30, 1);
+ verifyTouchPoint("targetTouches", 0, 10, 10, 0);
+ verifyTouchPoint("targetTouches", 1, 20, 30, 1);
+ break;
+ case 1:
+ verifyTouchEvent("touchmove", 2, 1, 2);
+ verifyTouchPoint("touches", 0, 15, 15, 0);
+ verifyTouchPoint("changedTouches", 0, 15, 15, 0);
+ verifyTouchPoint("touches", 1, 20, 30, 1);
+ break;
+ case 2:
+ verifyTouchEvent("touchend", 1, 1, 1);
+ verifyTouchPoint("touches", 0, 20, 30, 1);
+ verifyTouchPoint("changedTouches", 0, 15, 15, 0);
+ verifyTouchPoint("targetTouches", 0, 20, 30, 1);
+ break;
+ case 3:
+ verifyTouchEvent("touchend", 0, 1, 0);
+ verifyTouchPoint("changedTouches", 0, 20, 30, 1);
+ break;
+
+ default: testFailed("Wrong number of touch events! (" + which + ")");
+ }
+}
+
+function multiTouchSequence()
+{
+ debug("multi touch sequence");
+
+ debug("Two touchpoints pressed");
+ eventSender.addTouchPoint(10, 10);
+ eventSender.addTouchPoint(20, 30);
+ eventSender.touchStart();
+
+ debug("First touchpoint moved");
+ eventSender.updateTouchPoint(0, 15, 15);
+ eventSender.touchMove();
+
+ debug("First touchpoint is released");
+ eventSender.releaseTouchPoint(0);
+ eventSender.touchEnd();
+
+ debug("Last remaining touchpoint is released");
+ eventSender.releaseTouchPoint(0);
+ eventSender.touchEnd();
+}
+
+if (window.eventSender) {
+ description("This tests basic multi touch event support.");
+
+ lastEvent = null;
+ eventSender.clearTouchPoints();
+ multiTouchSequence();
+} else {
+ debug("This test requires DumpRenderTree. Tap on the blue rect to log.")
+}
+
+var successfullyParsed = true;
diff --git a/LayoutTests/fast/events/touch/script-tests/basic-single-touch-events.js b/LayoutTests/fast/events/touch/script-tests/basic-single-touch-events.js
new file mode 100644
index 0000000..ca99d83
--- /dev/null
+++ b/LayoutTests/fast/events/touch/script-tests/basic-single-touch-events.js
@@ -0,0 +1,132 @@
+var div = document.createElement("div");
+div.id = "touchtarget";
+div.style.width = "100px";
+div.style.height = "100px";
+div.style.backgroundColor = "blue";
+
+var lastEvent = null;
+var touchEventsReceived = 0;
+var EXPECTED_TOUCH_EVENTS_TOTAL = 5;
+
+function touchEventCallback() {
+ if (window.eventSender) {
+ lastEvent = event;
+ verifyTouch(touchEventsReceived++);
+ } else {
+ debug(event.type);
+ }
+
+ if (window.layoutTestController && touchEventsReceived == EXPECTED_TOUCH_EVENTS_TOTAL) {
+ // If we've got here, we can safely say we were successfully parsed :) We need to
+ // call the isSucccessfullyParsed function to output the correct TEST COMPLETE
+ // footer message.
+ successfullyParsed = true;
+ isSuccessfullyParsed();
+ layoutTestController.notifyDone();
+ }
+}
+
+div.addEventListener("touchstart", touchEventCallback, false);
+div.addEventListener("touchmove", touchEventCallback, false);
+div.addEventListener("touchend", touchEventCallback, false);
+document.body.insertBefore(div, document.body.firstChild);
+
+function verifyTouchEvent(type, totalTouchCount, changedTouchCount, targetTouchCount)
+{
+ shouldBeEqualToString("lastEvent.type", type);
+ shouldBe("lastEvent.touches.length", totalTouchCount.toString());
+ shouldBe("lastEvent.changedTouches.length", changedTouchCount.toString());
+ shouldBe("lastEvent.targetTouches.length", targetTouchCount.toString());
+}
+
+function verifyTouchPoint(list, point, x, y, id)
+{
+ shouldBe("lastEvent." + list + "[" + point + "].pageX", x.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].pageY", y.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].clientX", x.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].clientY", y.toString());
+ shouldBe("lastEvent." + list + "[" + point + "].identifier", id.toString());
+}
+
+function verifyTouch(which) {
+ switch (which) {
+ case 0:
+ verifyTouchEvent("touchstart", 1, 1, 1);
+ shouldBe("lastEvent.shiftKey", "false");
+ shouldBeEqualToString("lastEvent.touches[0].target.id", "touchtarget");
+ verifyTouchPoint("touches", 0, 10, 10, 0);
+ verifyTouchPoint("changedTouches", 0, 10, 10, 0);
+ verifyTouchPoint("targetTouches", 0, 10, 10, 0);
+ break;
+ case 1:
+ verifyTouchEvent("touchmove", 1, 1, 1);
+ verifyTouchPoint("touches", 0, 20, 15, 0);
+ shouldBe("lastEvent.shiftKey", "true");
+ shouldBe("lastEvent.altKey", "true");
+ shouldBe("lastEvent.ctrlKey", "false");
+ shouldBe("lastEvent.metaKey", "false");
+ break;
+ case 2:
+ verifyTouchEvent("touchend", 0, 1, 0);
+ verifyTouchPoint("changedTouches", 0, 20, 15, 0);
+ shouldBe("lastEvent.shiftKey", "false");
+ shouldBe("lastEvent.altKey", "false");
+ break;
+ case 3:
+ verifyTouchEvent("touchstart", 1, 1, 1);
+ shouldBeEqualToString("lastEvent.targetTouches[0].target.tagName", "DIV");
+ break;
+ case 4:
+ verifyTouchEvent("touchmove", 1, 1, 0);
+ shouldBeEqualToString("lastEvent.touches[0].target.tagName", "HTML");
+ break;
+
+ default: testFailed("Wrong number of touch events! (" + which + ")");
+ }
+}
+
+function singleTouchSequence()
+{
+ eventSender.addTouchPoint(10, 10);
+ eventSender.touchStart();
+
+ eventSender.updateTouchPoint(0, 20, 15);
+ eventSender.setTouchModifier("shift", true);
+ eventSender.setTouchModifier("alt", true);
+ eventSender.touchMove();
+
+ eventSender.setTouchModifier("shift", false);
+ eventSender.setTouchModifier("alt", false);
+
+ eventSender.releaseTouchPoint(0);
+ eventSender.touchEnd();
+}
+
+function touchTargets()
+{
+ eventSender.addTouchPoint(10, 10);
+ eventSender.touchStart();
+
+ eventSender.updateTouchPoint(0, 1000, 1000);
+ eventSender.touchMove();
+}
+
+if (window.layoutTestController)
+ layoutTestController.waitUntilDone();
+
+if (window.eventSender) {
+ description("This tests basic single touch event support.");
+
+ lastEvent = null;
+ eventSender.clearTouchPoints();
+ singleTouchSequence();
+
+ lastEvent = null;
+ eventSender.clearTouchPoints();
+ touchTargets();
+
+} else {
+ debug("This test requires DumpRenderTree. Tap on the blue rect to log.")
+}
+
+
diff --git a/LayoutTests/fast/events/touch/script-tests/basic-touch-events.js b/LayoutTests/fast/events/touch/script-tests/basic-touch-events.js
deleted file mode 100644
index 6766abc..0000000
--- a/LayoutTests/fast/events/touch/script-tests/basic-touch-events.js
+++ /dev/null
@@ -1,154 +0,0 @@
-description = "This tests basic touch event support.";
-
-var div = document.createElement("div");
-div.id = "touchtarget";
-div.style.width = "100px";
-div.style.height = "100px";
-div.style.backgroundColor = "blue";
-
-var lastEvent = null;
-
-function appendEventLog() {
- if (window.eventSender) {
- lastEvent = event;
- } else {
- debug(event.type);
- }
-}
-
-div.addEventListener("touchstart", appendEventLog, false);
-div.addEventListener("touchmove", appendEventLog, false);
-div.addEventListener("touchend", appendEventLog, false);
-document.body.insertBefore(div, document.body.firstChild);
-
-function verifyTouchEvent(type, totalTouchCount, changedTouchCount, targetTouchCount)
-{
- shouldBeEqualToString("lastEvent.type", type);
- shouldBe("lastEvent.touches.length", totalTouchCount.toString());
- shouldBe("lastEvent.changedTouches.length", changedTouchCount.toString());
- shouldBe("lastEvent.targetTouches.length", targetTouchCount.toString());
-}
-
-function verifyTouchPoint(list, point, x, y, id)
-{
- shouldBe("lastEvent." + list + "[" + point + "].pageX", x.toString());
- shouldBe("lastEvent." + list + "[" + point + "].pageY", y.toString());
- shouldBe("lastEvent." + list + "[" + point + "].clientX", x.toString());
- shouldBe("lastEvent." + list + "[" + point + "].clientY", y.toString());
- shouldBe("lastEvent." + list + "[" + point + "].identifier", id.toString());
-}
-
-function singleTouchSequence()
-{
- debug("single touch sequence");
-
- eventSender.addTouchPoint(10, 10);
- eventSender.touchStart();
-
- verifyTouchEvent("touchstart", 1, 1, 1);
- shouldBe("lastEvent.shiftKey", "false");
- shouldBeEqualToString("lastEvent.touches[0].target.id", "touchtarget");
- verifyTouchPoint("touches", 0, 10, 10, 0);
- verifyTouchPoint("changedTouches", 0, 10, 10, 0);
- verifyTouchPoint("targetTouches", 0, 10, 10, 0);
-
- eventSender.updateTouchPoint(0, 20, 15);
- eventSender.setTouchModifier("shift", true);
- eventSender.setTouchModifier("alt", true);
- eventSender.touchMove();
-
- verifyTouchEvent("touchmove", 1, 1, 1);
- verifyTouchPoint("touches", 0, 20, 15, 0);
- shouldBe("lastEvent.shiftKey", "true");
- shouldBe("lastEvent.altKey", "true");
- shouldBe("lastEvent.ctrlKey", "false");
- shouldBe("lastEvent.metaKey", "false");
-
- eventSender.setTouchModifier("shift", false);
- eventSender.setTouchModifier("alt", false);
-
- eventSender.releaseTouchPoint(0);
- eventSender.touchEnd();
-
- verifyTouchEvent("touchend", 0, 1, 0);
- verifyTouchPoint("changedTouches", 0, 20, 15, 0);
- shouldBe("lastEvent.shiftKey", "false");
- shouldBe("lastEvent.altKey", "false");
-}
-
-function multiTouchSequence()
-{
- debug("multi touch sequence");
-
- debug("Two touchpoints pressed");
- eventSender.addTouchPoint(10, 10);
- eventSender.addTouchPoint(20, 30);
- eventSender.touchStart();
- verifyTouchEvent("touchstart", 2, 2, 2);
- verifyTouchPoint("touches", 0, 10, 10, 0);
- verifyTouchPoint("touches", 1, 20, 30, 1);
- verifyTouchPoint("changedTouches", 0, 10, 10, 0);
- verifyTouchPoint("changedTouches", 1, 20, 30, 1);
- verifyTouchPoint("targetTouches", 0, 10, 10, 0);
- verifyTouchPoint("targetTouches", 1, 20, 30, 1);
-
- debug("First touchpoint moved");
- eventSender.updateTouchPoint(0, 15, 15);
- eventSender.touchMove();
- verifyTouchEvent("touchmove", 2, 1, 2);
- verifyTouchPoint("touches", 0, 15, 15, 0);
- verifyTouchPoint("changedTouches", 0, 15, 15, 0);
- verifyTouchPoint("touches", 1, 20, 30, 1);
-
- debug("First touchpoint is released");
- eventSender.releaseTouchPoint(0);
- eventSender.touchEnd();
- verifyTouchEvent("touchend", 1, 1, 1);
- verifyTouchPoint("touches", 0, 20, 30, 1);
- verifyTouchPoint("changedTouches", 0, 15, 15, 0);
- verifyTouchPoint("targetTouches", 0, 20, 30, 1);
-
- debug("Last remaining touchpoint is released");
- eventSender.releaseTouchPoint(0);
- eventSender.touchEnd();
- verifyTouchEvent("touchend", 0, 1, 0);
- verifyTouchPoint("changedTouches", 0, 20, 30, 1);
-}
-
-function touchTargets()
-{
- debug("verify touch targets");
-
- eventSender.addTouchPoint(10, 10);
- eventSender.touchStart();
-
- verifyTouchEvent("touchstart", 1, 1, 1);
- shouldBeEqualToString("lastEvent.targetTouches[0].target.tagName", "DIV");
-
- eventSender.updateTouchPoint(0, 1000, 1000);
- eventSender.touchMove();
-
- verifyTouchEvent("touchmove", 1, 1, 0);
- shouldBeEqualToString("lastEvent.touches[0].target.tagName", "HTML");
-}
-
-if (window.eventSender) {
- debug(description);
-
- lastEvent = null;
- eventSender.clearTouchPoints();
- singleTouchSequence();
-
- lastEvent = null;
- eventSender.clearTouchPoints();
- multiTouchSequence();
-
- lastEvent = null;
- eventSender.clearTouchPoints();
- touchTargets();
-
-} else {
- debug("This test requires DumpRenderTree. Tap on the blue rect to log.")
-}
-
-var successfullyParsed = true;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list