Revert "Automate pointerevent pointerlock tests"
This reverts commit de87ca945cfee1a8cf2471e9fffc2597b143e20c.
Reason for revert:
external/wpt/pointerevents/pointerlock/pointerevent_movementxy.html fails on
https://ci.chromium.org/p/chromium/builders/ci/WebKit%20Mac10.13%20%28retina%29/15841
external/wpt/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html
* external/wpt/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html cause memory leak
https://ci.chromium.org/p/chromium/builders/ci/WebKit%20Linux%20Leak/934
Original change's description:
> Automate pointerevent pointerlock tests
>
> Move from gpubenchmarking automation to test driver
>
> Bug: 606367
> Change-Id: I4fbb3c9fcdda698178c8463397af4d31d0ce5080
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1660796
> Commit-Queue: Ella Ge <eirage@chromium.org>
> Reviewed-by: Lan Wei <lanwei@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#670527}
TBR=lanwei@chromium.org,nzolghadr@chromium.org,eirage@chromium.org
Change-Id: Iaba73cad638554ec19c21fdf821e0cf796807d47
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 606367
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1667752
Reviewed-by: Lan Wei <lanwei@chromium.org>
Commit-Queue: Lan Wei <lanwei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#670570}
diff --git a/pointerevents/pointerlock/pointerevent_movementxy.html b/pointerevents/pointerlock/pointerevent_movementxy-manual.html
similarity index 74%
rename from pointerevents/pointerlock/pointerevent_movementxy.html
rename to pointerevents/pointerlock/pointerevent_movementxy-manual.html
index 2d6147d..6d903c4 100644
--- a/pointerevents/pointerlock/pointerevent_movementxy.html
+++ b/pointerevents/pointerlock/pointerevent_movementxy-manual.html
@@ -2,14 +2,11 @@
<html>
<head>
<title>Pointer Events properties tests</title>
- <meta name="timeout" content="long">
+<meta name="timeout" content="long">
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="/resources/testdriver.js"></script>
- <script src="/resources/testdriver-actions.js"></script>
- <script src="/resources/testdriver-vendor.js"></script>
<!-- Additional helper script for common checks across event types -->
<script type="text/javascript" src="../pointerevent_support.js"></script>
<style>
@@ -48,21 +45,8 @@
lastScreenY = 0;
}
- function injectInput(pointerType) {
- var pointerId = pointerType + "Pointer1";
- return new test_driver.Actions()
- .addPointer(pointerId, pointerType)
- .pointerMove(0, 0, {origin: box1})
- .pointerDown()
- .pointerMove(20, 30, {origin: box1})
- .pointerMove(60, 40, {origin: box1})
- .pointerMove(0, 0, {origin: box2})
- .pointerUp()
- .send();
- }
-
function run() {
- var test_pointerEvent = setup_pointerevent_test("pointerevent attributes", ALL_POINTERS);
+ var test_pointerEvent = setup_pointerevent_test("pointerevent attributes", ['mouse', 'touch']);
[document, document.getElementById('innerFrame').contentDocument].forEach(function(element) {
on_event(element, 'pointermove', function (event) {
@@ -89,22 +73,14 @@
startSummation = false;
test_pointerEvent.done();
});
-
- // Inject input
- injectInput("mouse").then(function(){
- return injectInput("touch")
- }).then(function() {
- return injectInput("pen")
- })
}
-
</script>
</head>
<body onload="run()">
<h1>Pointer Events movementX/Y attribute test</h1>
<h2 id="pointerTypeDescription"></h2>
<h4>
- Test Description: This test checks the movementX/Y properties of pointer events.
+ Test Description: This test checks the properties of pointer events that do not support hover.
<ol>
<li>Press down on the black square.</li>
<li>Move your pointer slowly along a straight line to the red square.</li>
diff --git a/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html b/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture-manual.html
similarity index 79%
rename from pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html
rename to pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture-manual.html
index 3c768ef..8ac35f8 100644
--- a/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture.html
+++ b/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture-manual.html
@@ -6,9 +6,6 @@
<link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="/resources/testdriver.js"></script>
- <script src="/resources/testdriver-actions.js"></script>
- <script src="/resources/testdriver-vendor.js"></script>
<!-- Additional helper script for common checks across event types -->
<script type="text/javascript" src="../pointerevent_support.js"></script>
<script>
@@ -54,19 +51,6 @@
on_event(document,"pointerlockerror", function() {
assert_unreached("Pointer lock error");
})
-
- // Inject mouse input
- var actions = new test_driver.Actions();
- actions.pointerMove(0, 0, {origin: div1})
- .pointerDown({button: actions.ButtonType.LEFT})
- .pointerMove(30, 30, {origin: div1})
- .pointerMove(30, 0, {origin: div1})
- .pointerDown({button: actions.ButtonType.RIGHT})
- .pointerMove(60, 30, {origin: div1})
- .pointerMove(20, 20, {origin: div1})
- .pointerUp({button: actions.ButtonType.RIGHT})
- .pointerUp({button: actions.ButtonType.LEFT})
- .send();
}
</script>
</head>
diff --git a/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html b/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture-manual.html
similarity index 82%
rename from pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html
rename to pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture-manual.html
index 98fec4e..d8dbeaa 100644
--- a/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html
+++ b/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture-manual.html
@@ -6,9 +6,6 @@
<link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="/resources/testdriver.js"></script>
- <script src="/resources/testdriver-actions.js"></script>
- <script src="/resources/testdriver-vendor.js"></script>
<!-- Additional helper script for common checks across event types -->
<script type="text/javascript" src="../pointerevent_support.js"></script>
<script>
@@ -23,7 +20,7 @@
var test_pointerEvent = setup_pointerevent_test("no pointercapture while pointerlock", ['mouse']);
var div1 = document.getElementById("div1");
var div2 = document.getElementById("div2");
-
+
on_event(div1, 'pointerdown', function(event) {
div2.setPointerCapture(event.pointerId);
div1.requestPointerLock();
@@ -49,7 +46,7 @@
} else if (lock_change_count == 2) {
mouse_move_count++;
- if (mouse_move_count >= 2) {
+ if (mouse_move_count == 2) {
test_pointerEvent.step(function() {
assert_equals(capture_count, 0, "There shouldn't be any capture events fired.");
});
@@ -72,20 +69,6 @@
assert_equals(document.pointerLockElement, null, "document.pointerLockElement should be null.");
});
});
-
- // Inject mouse input
- var actions = new test_driver.Actions();
- actions.pointerMove(0, 0, {origin: div1})
- .pointerDown()
- .pointerMove(30, 30, {origin: div1})
- .pointerMove(60, 30, {origin: div1})
- .pointerMove(30, 20, {origin: div1})
- .pointerMove(10, 50, {origin: div1})
- .pointerMove(40, 10, {origin: div1})
- .pointerMove(5, 30, {origin: div1})
- .pointerMove(-5, 15, {origin: div1})
- .pointerUp()
- .send();
}
</script>
</head>
diff --git a/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html b/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock-manual.html
similarity index 77%
rename from pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html
rename to pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock-manual.html
index b2251d6..80c01d6 100644
--- a/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html
+++ b/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock-manual.html
@@ -6,9 +6,6 @@
<link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="/resources/testdriver.js"></script>
- <script src="/resources/testdriver-actions.js"></script>
- <script src="/resources/testdriver-vendor.js"></script>
<!-- Additional helper script for common checks across event types -->
<script type="text/javascript" src="../pointerevent_support.js"></script>
</head>
@@ -61,25 +58,9 @@
});
}
});
-
on_event(target0, "click", function(event) {
target0.requestPointerLock();
});
-
- var x = innerframe.getBoundingClientRect().x + target1.getBoundingClientRect().x;
- var y = innerframe.getBoundingClientRect().y + target1.getBoundingClientRect().y;
- // Inject mouse input
- new test_driver.Actions()
- .pointerMove(5, 5, {origin: target0})
- .pointerDown()
- .pointerUp()
- .pointerMove(100, 300, {origin: target0})
- .pointerMove(x+10, y+10)
- .pointerDown()
- .pointerUp()
- .pointerMove(5, 5, {origin: target0})
- .send();
-
}
</script>
diff --git a/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html b/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked-manual.html
similarity index 85%
rename from pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html
rename to pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked-manual.html
index a6f238c..b2fadbf 100644
--- a/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html
+++ b/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked-manual.html
@@ -7,9 +7,6 @@
<link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
- <script src="/resources/testdriver.js"></script>
- <script src="/resources/testdriver-actions.js"></script>
- <script src="/resources/testdriver-vendor.js"></script>
<!-- Additional helper script for common checks across event types -->
<script type="text/javascript" src="../pointerevent_support.js"></script>
</head>
@@ -17,7 +14,7 @@
<h2>PointerMove</h2>
<h4>Test Description: This test checks if pointermove event are triggered by button state changes
<ol>
- <li>Click on the black rectangle to lock the pointer </li>
+ <li>Lick on the black rectangle to lock the pointer </li>
<li>Press a button and hold it</li>
<li>Press a second button</li>
<li>Release the second button</li>
@@ -89,17 +86,6 @@
on_event(target0, "contextmenu", function (event) {
event.preventDefault();
});
-
- // Inject mouse input
- var actions = new test_driver.Actions();
- actions.pointerMove(0, 0, {origin: target0})
- .pointerDown({button: actions.ButtonType.LEFT})
- .pointerUp({button: actions.ButtonType.LEFT})
- .pointerDown({button: actions.ButtonType.LEFT})
- .pointerDown({button: actions.ButtonType.MIDDLE})
- .pointerUp({button: actions.ButtonType.MIDDLE})
- .pointerUp({button: actions.ButtonType.LEFT})
- .send();
}
</script>
<h1>Pointer Lock Pointer Events pointermove on button state changes Tests</h1>
