Diff
Modified: trunk/LayoutTests/ChangeLog (281814 => 281815)
--- trunk/LayoutTests/ChangeLog 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/ChangeLog 2021-08-31 20:06:58 UTC (rev 281815)
@@ -1,3 +1,30 @@
+2021-08-31 Wenson Hsieh <[email protected]>
+
+ EWS should run tests in fast/events/ios by default
+ https://bugs.webkit.org/show_bug.cgi?id=229691
+
+ Reviewed by Tim Horton.
+
+ Enable most of the tests in fast/events/ios in open source test runners, so that they can run in pre-commit
+ automation (EWS). We move a handful of tests that have explicit dependencies on touch events out of this
+ directory and into fast/events/touch/ios instead.
+
+ * fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt: Renamed from LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt.
+ * fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html: Renamed from LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html.
+ * fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt: Renamed from LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt.
+ * fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html: Renamed from LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html.
+ * fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt: Renamed from LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt.
+ * fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow.html: Renamed from LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow.html.
+ * platform/ios-14/TestExpectations:
+ * platform/ios-wk2/TestExpectations:
+
+ Mark tests in both fast/events/ios and fast/forms/ios as PASS by default, while skipping the "ipad" directories
+ that are underneath them. These ipad-specific test directories are then marked PASS by default below, in
+ platform/ipad/TestExpectations.
+
+ * platform/ios/TestExpectations:
+ * platform/ipad/TestExpectations:
+
2021-08-31 Arcady Goldmints-Orlov <[email protected]>
[GLIB] Update test baselines after r281771
Deleted: trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt (281814 => 281815)
--- trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt 2021-08-31 20:06:58 UTC (rev 281815)
@@ -1,10 +0,0 @@
-PASS document.scrollingElement.scrollTop became different from 0
-PASS document.getElementById('touches').textContent is "1"
-PASS document.getElementById('touches').textContent is "1"
-PASS document.getElementById('touches').textContent is "2"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-To manually test, swipe down to scroll in the document. The touch count should update to 1. Tap anywhere to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the document. The touch count should be 2.
-
-The touch count is: 2
Deleted: trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html (281814 => 281815)
--- trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html 2021-08-31 20:06:58 UTC (rev 281815)
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<head>
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <script src=""
- <style>
- body {
- width: 100%;
- height: 5000vh;
- font-family: -apple-system;
- color: white;
- margin: 0;
- background-color: red;
- padding: 1em;
- box-sizing: border-box;
- }
-
- .description {
- position: fixed;
- }
- </style>
-</head>
-<body>
-<div class="description">
- <p>To manually test, swipe down to scroll in the document. The touch count should update to 1. Tap anywhere to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the document. The touch count should be 2.</p>
- <p>The touch count is: <span id="touches">0</span></p>
-</div>
-<script src=""
-<script>
-touchstartEventCount = 0;
-
-document.scrollingElement.scrollTop = 0;
-document.body.addEventListener("touchstart", () => {
- document.body.style.backgroundColor = (++touchstartEventCount == 2) ? "green" : "red";
- touches.textContent = `${touchstartEventCount}`;
-});
-
-function getSwipeUIScript(fromX, fromY, toX, toY, duration)
-{
- return `(() => {
- uiController.dragFromPointToPoint(${fromX}, ${fromY}, ${toX}, ${toY}, ${duration}, () => {
- uiController.uiScriptComplete("");
- });
- })();`;
-}
-
-function expectTouchCountToBe(count)
-{
- shouldBeEqualToString("document.getElementById('touches').textContent", `${count}`);
-}
-
-if (window.testRunner && testRunner.runUIScript) {
- testRunner.dumpAsText();
- jsTestIsAsync = true;
- testRunner.runUIScript(getSwipeUIScript(100, 0.75 * innerHeight, 100, 0.25 * innerHeight, 0.1), () => {
- shouldBecomeDifferent("document.scrollingElement.scrollTop", "0", () => {
- expectTouchCountToBe(1);
- UIHelper.tapAt(100, document.scrollingElement.scrollTop + 0.75 * innerHeight).then(() => {
- expectTouchCountToBe(1);
- UIHelper.tapAt(100, document.scrollingElement.scrollTop + 0.25 * innerHeight).then(() => {
- expectTouchCountToBe(2);
- finishJSTest();
- });
- });
- });
- });
-}
-</script>
-<script src=""
-</body>
Deleted: trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt (281814 => 281815)
--- trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt 2021-08-31 20:06:58 UTC (rev 281815)
@@ -1,10 +0,0 @@
-PASS document.getElementById('container').scrollTop became different from 0
-PASS document.getElementById('touches').textContent is "1"
-PASS document.getElementById('touches').textContent is "1"
-PASS document.getElementById('touches').textContent is "2"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-To manually test, swipe down to scroll in the container. The touch count should update to 1. Tap to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the container. The touch count should be 2.
-
-The touch count is: 2
Deleted: trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html (281814 => 281815)
--- trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html 2021-08-31 20:06:58 UTC (rev 281815)
@@ -1,86 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ AsyncOverflowScrollingEnabled=true ] -->
-<head>
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <script src=""
- <style>
- body {
- width: 100%;
- height: 100%;
- font-family: -apple-system;
- margin: 0;
- box-sizing: border-box;
- }
-
- #container {
- width: 100%;
- height: 300px;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- margin: 0 auto;
- background-color: red;
- top: 0;
- position: absolute;
- }
-
- #container > div {
- height: 10000px;
- width: 100%;
- float: left;
- }
-
- #description {
- top: 300px;
- position: absolute;
- }
- </style>
-</head>
-<body>
-<div id="container">
- <div class="area"></div>
-</div>
-<div id="description">
- <p>To manually test, swipe down to scroll in the container. The touch count should update to 1. Tap to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the container. The touch count should be 2.</p>
- <p>The touch count is: <span id="touches">0</span></p>
-</div>
-<script src=""
-<script>
-touchstartEventCount = 0;
-container.scrollTop = 0;
-container.addEventListener("touchstart", () => {
- container.style.backgroundColor = (++touchstartEventCount % 2) ? "green" : "red";
- touches.textContent = `${touchstartEventCount}`;
-});
-
-function getSwipeUIScript(fromX, fromY, toX, toY, duration)
-{
- return `(() => {
- uiController.dragFromPointToPoint(${fromX}, ${fromY}, ${toX}, ${toY}, ${duration}, () => {
- uiController.uiScriptComplete("");
- });
- })();`;
-}
-
-function expectTouchCountToBe(count)
-{
- shouldBeEqualToString("document.getElementById('touches').textContent", `${count}`);
-}
-
-if (window.testRunner && testRunner.runUIScript) {
- testRunner.dumpAsText();
- jsTestIsAsync = true;
- testRunner.runUIScript(getSwipeUIScript(100, 250, 100, 50, 0.1), () => {
- shouldBecomeDifferent("document.getElementById('container').scrollTop", "0", () => {
- expectTouchCountToBe(1);
- UIHelper.tapAt(100, 250).then(() => {
- expectTouchCountToBe(1);
- UIHelper.tapAt(100, 50).then(() => {
- expectTouchCountToBe(2);
- finishJSTest();
- });
- });
- });
- });
-}
-</script>
-<script src=""
-</body>
Deleted: trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt (281814 => 281815)
--- trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt 2021-08-31 20:06:58 UTC (rev 281815)
@@ -1,13 +0,0 @@
-PASS document.getElementById('container').scrollTop became different from 0
-PASS document.getElementById('containerTouches').textContent is "1"
-PASS document.getElementById('documentTouches').textContent is "1"
-PASS document.getElementById('containerTouches').textContent is "1"
-PASS document.getElementById('documentTouches').textContent is "2"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-To manually test, swipe down to scroll in the container. Both touch counts should update to 1. Then tap elsewhere in the document. The document touch count should increment to 2, but the container touch count should remain at 1.
-
-The touch count in the scroll container is: 1
-
-The touch count in the document is: 2
Deleted: trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow.html (281814 => 281815)
--- trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow.html 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow.html 2021-08-31 20:06:58 UTC (rev 281815)
@@ -1,83 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ AsyncOverflowScrollingEnabled=true ] -->
-<head>
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <script src=""
- <script src=""
- <style>
- body {
- width: 100%;
- height: 500vh;
- font-family: -apple-system;
- margin: 0;
- box-sizing: border-box;
- }
-
- #container {
- width: 100%;
- height: 300px;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- margin: 0 auto;
- background-color: red;
- top: 0;
- position: absolute;
- }
-
- #container > div {
- height: 10000px;
- width: 100%;
- float: left;
- }
-
- #description {
- top: 300px;
- position: absolute;
- }
- </style>
-</head>
-<body>
-<div id="container">
- <div class="area"></div>
-</div>
-<div id="description">
- <p>To manually test, swipe down to scroll in the container. Both touch counts should update to 1. Then tap elsewhere in the document. The document touch count should increment to 2, but the container touch count should remain at 1.</p>
- <p>The touch count in the scroll container is: <span id="containerTouches">0</span></p>
- <p>The touch count in the document is: <span id="documentTouches">0</span></p>
-</div>
-<script src=""
-<script>
-containerTouchstartEventCount = 0;
-documentTouchstartEventCount = 0;
-container.scrollTop = 0;
-document.scrollingElement.scrollTop = 0;
-container.addEventListener("touchstart", () => {
- container.style.backgroundColor = (++containerTouchstartEventCount == 1) ? "green" : "red";
- containerTouches.textContent = `${containerTouchstartEventCount}`;
-});
-document.body.addEventListener("touchstart", () => {
- document.body.style.backgroundColor = (++documentTouchstartEventCount == 2) ? "green" : "red";
- documentTouches.textContent = `${documentTouchstartEventCount}`;
-});
-
-function expectTouchCountsToBe(containerCount, documentCount)
-{
- shouldBeEqualToString("document.getElementById('containerTouches').textContent", `${containerCount}`);
- shouldBeEqualToString("document.getElementById('documentTouches').textContent", `${documentCount}`);
-}
-
-jsTestIsAsync = true;
-
-if (window.testRunner && testRunner.runUIScript) {
- testRunner.dumpAsText();
- (async () => {
- await UIHelper.dragFromPointToPoint(100, 250, 100, 50, 0.1);
- await new Promise(resolve => shouldBecomeDifferent("document.getElementById('container').scrollTop", "0", resolve));
- expectTouchCountsToBe(1, 1);
- await UIHelper.activateAt(100, 350);
- expectTouchCountsToBe(1, 2);
- finishJSTest();
- })();
-}
-</script>
-<script src=""
-</body>
Copied: trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt (from rev 281814, trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt) (0 => 281815)
--- trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe-expected.txt 2021-08-31 20:06:58 UTC (rev 281815)
@@ -0,0 +1,10 @@
+PASS document.scrollingElement.scrollTop became different from 0
+PASS document.getElementById('touches').textContent is "1"
+PASS document.getElementById('touches').textContent is "1"
+PASS document.getElementById('touches').textContent is "2"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+To manually test, swipe down to scroll in the document. The touch count should update to 1. Tap anywhere to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the document. The touch count should be 2.
+
+The touch count is: 2
Copied: trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html (from rev 281814, trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html) (0 => 281815)
--- trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-mainframe.html 2021-08-31 20:06:58 UTC (rev 281815)
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <script src=""
+ <style>
+ body {
+ width: 100%;
+ height: 5000vh;
+ font-family: -apple-system;
+ color: white;
+ margin: 0;
+ background-color: red;
+ padding: 1em;
+ box-sizing: border-box;
+ }
+
+ .description {
+ position: fixed;
+ }
+ </style>
+</head>
+<body>
+<div class="description">
+ <p>To manually test, swipe down to scroll in the document. The touch count should update to 1. Tap anywhere to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the document. The touch count should be 2.</p>
+ <p>The touch count is: <span id="touches">0</span></p>
+</div>
+<script src=""
+<script>
+touchstartEventCount = 0;
+
+document.scrollingElement.scrollTop = 0;
+document.body.addEventListener("touchstart", () => {
+ document.body.style.backgroundColor = (++touchstartEventCount == 2) ? "green" : "red";
+ touches.textContent = `${touchstartEventCount}`;
+});
+
+function getSwipeUIScript(fromX, fromY, toX, toY, duration)
+{
+ return `(() => {
+ uiController.dragFromPointToPoint(${fromX}, ${fromY}, ${toX}, ${toY}, ${duration}, () => {
+ uiController.uiScriptComplete("");
+ });
+ })();`;
+}
+
+function expectTouchCountToBe(count)
+{
+ shouldBeEqualToString("document.getElementById('touches').textContent", `${count}`);
+}
+
+if (window.testRunner && testRunner.runUIScript) {
+ testRunner.dumpAsText();
+ jsTestIsAsync = true;
+ testRunner.runUIScript(getSwipeUIScript(100, 0.75 * innerHeight, 100, 0.25 * innerHeight, 0.1), () => {
+ shouldBecomeDifferent("document.scrollingElement.scrollTop", "0", () => {
+ expectTouchCountToBe(1);
+ UIHelper.tapAt(100, document.scrollingElement.scrollTop + 0.75 * innerHeight).then(() => {
+ expectTouchCountToBe(1);
+ UIHelper.tapAt(100, document.scrollingElement.scrollTop + 0.25 * innerHeight).then(() => {
+ expectTouchCountToBe(2);
+ finishJSTest();
+ });
+ });
+ });
+ });
+}
+</script>
+<script src=""
+</body>
Copied: trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt (from rev 281814, trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt) (0 => 281815)
--- trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow-expected.txt 2021-08-31 20:06:58 UTC (rev 281815)
@@ -0,0 +1,10 @@
+PASS document.getElementById('container').scrollTop became different from 0
+PASS document.getElementById('touches').textContent is "1"
+PASS document.getElementById('touches').textContent is "1"
+PASS document.getElementById('touches').textContent is "2"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+To manually test, swipe down to scroll in the container. The touch count should update to 1. Tap to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the container. The touch count should be 2.
+
+The touch count is: 2
Copied: trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html (from rev 281814, trunk/LayoutTests/fast/events/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html) (0 => 281815)
--- trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/no-touch-events-when-stopping-momentum-scroll-in-overflow.html 2021-08-31 20:06:58 UTC (rev 281815)
@@ -0,0 +1,86 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ AsyncOverflowScrollingEnabled=true ] -->
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <script src=""
+ <style>
+ body {
+ width: 100%;
+ height: 100%;
+ font-family: -apple-system;
+ margin: 0;
+ box-sizing: border-box;
+ }
+
+ #container {
+ width: 100%;
+ height: 300px;
+ overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
+ margin: 0 auto;
+ background-color: red;
+ top: 0;
+ position: absolute;
+ }
+
+ #container > div {
+ height: 10000px;
+ width: 100%;
+ float: left;
+ }
+
+ #description {
+ top: 300px;
+ position: absolute;
+ }
+ </style>
+</head>
+<body>
+<div id="container">
+ <div class="area"></div>
+</div>
+<div id="description">
+ <p>To manually test, swipe down to scroll in the container. The touch count should update to 1. Tap to stop scrolling while decelerating. The touch count should remain at 1. Then tap again in the container. The touch count should be 2.</p>
+ <p>The touch count is: <span id="touches">0</span></p>
+</div>
+<script src=""
+<script>
+touchstartEventCount = 0;
+container.scrollTop = 0;
+container.addEventListener("touchstart", () => {
+ container.style.backgroundColor = (++touchstartEventCount % 2) ? "green" : "red";
+ touches.textContent = `${touchstartEventCount}`;
+});
+
+function getSwipeUIScript(fromX, fromY, toX, toY, duration)
+{
+ return `(() => {
+ uiController.dragFromPointToPoint(${fromX}, ${fromY}, ${toX}, ${toY}, ${duration}, () => {
+ uiController.uiScriptComplete("");
+ });
+ })();`;
+}
+
+function expectTouchCountToBe(count)
+{
+ shouldBeEqualToString("document.getElementById('touches').textContent", `${count}`);
+}
+
+if (window.testRunner && testRunner.runUIScript) {
+ testRunner.dumpAsText();
+ jsTestIsAsync = true;
+ testRunner.runUIScript(getSwipeUIScript(100, 250, 100, 50, 0.1), () => {
+ shouldBecomeDifferent("document.getElementById('container').scrollTop", "0", () => {
+ expectTouchCountToBe(1);
+ UIHelper.tapAt(100, 250).then(() => {
+ expectTouchCountToBe(1);
+ UIHelper.tapAt(100, 50).then(() => {
+ expectTouchCountToBe(2);
+ finishJSTest();
+ });
+ });
+ });
+ });
+}
+</script>
+<script src=""
+</body>
Copied: trunk/LayoutTests/fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt (from rev 281814, trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt) (0 => 281815)
--- trunk/LayoutTests/fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow-expected.txt 2021-08-31 20:06:58 UTC (rev 281815)
@@ -0,0 +1,13 @@
+PASS document.getElementById('container').scrollTop became different from 0
+PASS document.getElementById('containerTouches').textContent is "1"
+PASS document.getElementById('documentTouches').textContent is "1"
+PASS document.getElementById('containerTouches').textContent is "1"
+PASS document.getElementById('documentTouches').textContent is "2"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+To manually test, swipe down to scroll in the container. Both touch counts should update to 1. Then tap elsewhere in the document. The document touch count should increment to 2, but the container touch count should remain at 1.
+
+The touch count in the scroll container is: 1
+
+The touch count in the document is: 2
Copied: trunk/LayoutTests/fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow.html (from rev 281814, trunk/LayoutTests/fast/events/ios/touch-events-during-scroll-deceleration-in-overflow.html) (0 => 281815)
--- trunk/LayoutTests/fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/touch-events-during-scroll-deceleration-in-overflow.html 2021-08-31 20:06:58 UTC (rev 281815)
@@ -0,0 +1,82 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ AsyncOverflowScrollingEnabled=true ] -->
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <script src=""
+ <script src=""
+ <style>
+ body {
+ width: 100%;
+ height: 500vh;
+ font-family: -apple-system;
+ margin: 0;
+ box-sizing: border-box;
+ }
+
+ #container {
+ width: 100%;
+ height: 300px;
+ overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
+ margin: 0 auto;
+ background-color: red;
+ top: 0;
+ position: absolute;
+ }
+
+ #container > div {
+ height: 10000px;
+ width: 100%;
+ float: left;
+ }
+
+ #description {
+ top: 300px;
+ position: absolute;
+ }
+ </style>
+</head>
+<body>
+<div id="container">
+ <div class="area"></div>
+</div>
+<div id="description">
+ <p>To manually test, swipe down to scroll in the container. Both touch counts should update to 1. Then tap elsewhere in the document. The document touch count should increment to 2, but the container touch count should remain at 1.</p>
+ <p>The touch count in the scroll container is: <span id="containerTouches">0</span></p>
+ <p>The touch count in the document is: <span id="documentTouches">0</span></p>
+</div>
+<script>
+containerTouchstartEventCount = 0;
+documentTouchstartEventCount = 0;
+container.scrollTop = 0;
+document.scrollingElement.scrollTop = 0;
+container.addEventListener("touchstart", () => {
+ container.style.backgroundColor = (++containerTouchstartEventCount == 1) ? "green" : "red";
+ containerTouches.textContent = `${containerTouchstartEventCount}`;
+});
+document.body.addEventListener("touchstart", () => {
+ document.body.style.backgroundColor = (++documentTouchstartEventCount == 2) ? "green" : "red";
+ documentTouches.textContent = `${documentTouchstartEventCount}`;
+});
+
+function expectTouchCountsToBe(containerCount, documentCount)
+{
+ shouldBeEqualToString("document.getElementById('containerTouches').textContent", `${containerCount}`);
+ shouldBeEqualToString("document.getElementById('documentTouches').textContent", `${documentCount}`);
+}
+
+jsTestIsAsync = true;
+
+if (window.testRunner && testRunner.runUIScript) {
+ testRunner.dumpAsText();
+ (async () => {
+ await UIHelper.dragFromPointToPoint(100, 250, 100, 50, 0.1);
+ await new Promise(resolve => shouldBecomeDifferent("document.getElementById('container').scrollTop", "0", resolve));
+ expectTouchCountsToBe(1, 1);
+ await UIHelper.activateAt(100, 350);
+ expectTouchCountsToBe(1, 2);
+ finishJSTest();
+ })();
+}
+</script>
+<script src=""
+</body>
Modified: trunk/LayoutTests/platform/ios/TestExpectations (281814 => 281815)
--- trunk/LayoutTests/platform/ios/TestExpectations 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2021-08-31 20:06:58 UTC (rev 281815)
@@ -22,6 +22,11 @@
swipe [ Pass ]
http/tests/swipe [ Pass ]
+fast/events/ios [ Pass ]
+fast/events/ios/ipad [ Skip ]
+fast/forms/ios [ Pass ]
+fast/forms/ios/ipad [ Skip ]
+
fast/css/appearance-apple-pay-button.html [ Pass ]
fast/css/appearance-apple-pay-button-border-radius.html [ Pass ]
fast/css/appearance-apple-pay-button-default-corners.html [ Pass ]
Modified: trunk/LayoutTests/platform/ios-14/TestExpectations (281814 => 281815)
--- trunk/LayoutTests/platform/ios-14/TestExpectations 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/platform/ios-14/TestExpectations 2021-08-31 20:06:58 UTC (rev 281815)
@@ -91,4 +91,9 @@
fast/forms/ios/dismiss-picker-using-keyboard.html [ Pass Timeout ]
fast/forms/ios/drag-range-thumb.html [ Pass Timeout ]
fast/forms/ios/inputmode-change-update-keyboard.html [ Pass Timeout ]
-fast/forms/ios/ipad/open-picker-using-keyboard.html [ Pass Timeout ]
\ No newline at end of file
+fast/forms/ios/ipad/open-picker-using-keyboard.html [ Pass Timeout ]
+
+fast/events/ios/keydown-keyup-keypress-keys-in-non-editable-using-chinese-keyboard.html [ Pass Failure ]
+
+# These tests occasionally crash with debug assertions in iOS 14 simulator
+fast/events/ios/rotation [ Skip ]
\ No newline at end of file
Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (281814 => 281815)
--- trunk/LayoutTests/platform/ios-wk2/TestExpectations 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2021-08-31 20:06:58 UTC (rev 281815)
@@ -16,7 +16,6 @@
contact-picker/contacts-select.html [ Pass ]
fast/device-orientation [ Pass ]
http/tests/device-orientation [ Pass ]
-fast/forms/ios [ Pass ]
fast/history/ios [ Pass ]
fast/scrolling/ios [ Pass ]
fast/speechrecognition/ios [ Pass ]
Modified: trunk/LayoutTests/platform/ipad/TestExpectations (281814 => 281815)
--- trunk/LayoutTests/platform/ipad/TestExpectations 2021-08-31 19:11:54 UTC (rev 281814)
+++ trunk/LayoutTests/platform/ipad/TestExpectations 2021-08-31 20:06:58 UTC (rev 281815)
@@ -4,6 +4,9 @@
compositing/contents-format/ipad [ Pass ]
+fast/events/ios/ipad [ Pass ]
+fast/forms/ios/ipad [ Pass ]
+
# iPads don't zoom when form elements are focused
fast/forms/ios/user-scalable-scales-for-keyboard-focus-with-no-author-defined-scale.html [ Skip ]
fast/visual-viewport/ios/caret-after-focus-in-fixed.html [ Skip ]
