Skip to content

GitLab

T
tangled
Commit 4ad6e935 authored by Liviu Tinta's avatar Liviu Tinta Committed by Commit Bot
Browse files
Options

Move mouseevent_key_pressed.html to wpt 

Move mouse pointerevents compat events to wpt

Change-Id: I5b64c7108222d68f52711c2a19069ccb5cd3f379
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2211913Reviewed-by: default avatarLan Wei <lanwei@chromium.org>
Reviewed-by: default avatarNavid Zolghadr <nzolghadr@chromium.org>
Commit-Queue: Liviu Tinta <liviutinta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772329}
parent 829c833a
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 42 deletions
third_party/blink/web_tests/external/wpt/pointerevents/compat/pointerevent_mouseevent_key_pressed-expected.txt 0 → 100644
View file @ 4ad6e935
This is a testharness.js-based test.
FAIL Tests that the mouse events with some keys pressed. assert_true: Timed out waiting for pointermove expected true got false
Harness: the test ran to completion.
third_party/blink/web_tests/external/wpt/pointerevents/compat/pointerevent_mouseevent_key_pressed.html 0 → 100644
View file @ 4ad6e935
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Mouse events with keys pressed</title>
<link rel="author" title="Google" href="http://www.google.com/" />
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<script src="/resources/testdriver-actions.js"></script>
<script type="text/javascript" src="../pointerevent_support.js"></script>
<script>
let testMouseKeyPressed = async_test('Tests that the mouse events with some keys pressed.');
let activeKeys = false;
window.addEventListener('pointermove', function(e) {
activeKeys = e.getModifierState("Alt") &&
e.getModifierState("Control") &&
e.getModifierState("Meta") &&
e.getModifierState("Shift");
});
async function runTest(){
let event_watcher = new EventWatcher(testMouseKeyPressed, window, ["pointermove"],
()=>waitForAnimationFrames(200));
await Promise.all([event_watcher.wait_for(["pointermove"]), inject_input()]);
testMouseKeyPressed.step_func_done(()=>{
assert_true(activeKeys, "Modifier keys not reflected in the pointermove event!");
})();
}
function inject_input() {
const x = 100;
const y = 100;
const altKey = '\uE00A';
const ctrlKey = '\uE009';
const metaKey = '\uE03d';
const shiftKey = '\uE008'
// First press Alt, Control, Meta, Shift keys and then send a mouse move.
return new test_driver.Actions()
.keyDown(altKey)
.keyDown(ctrlKey)
.keyDown(metaKey)
.keyDown(shiftKey)
.pointerMove(x,y)
.send();
}
</script>
</head>
<body id="target" onload="runTest()">
<h4>Test Description: Tests that the mouse events with some keys pressed.
<ol>
<li>Press Alt, Control, Meta, Shift keys and move the mouse</li>
</ol>
</h4>
</body>
</html>
third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_support.js
View file @ 4ad6e935
...@@ -392,3 +392,13 @@ function resolveWhen(condition) { ...@@ -392,3 +392,13 @@ function resolveWhen(condition) {
tick(); tick();
}); });
} }
// Returns a promise that only gets resolved after n animation frames
function waitForAnimationFrames(n){
let p = 0;
function next(){
p++;
return p === n;
}
return resolveWhen(next);
}
third_party/blink/web_tests/fast/events/pointerevents/mouseevent_key_pressed.html deleted 100644 → 0
View file @ 829c833a
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Mouse events with keys pressed</title>
<link rel="author" title="Google" href="http://www.google.com/" />
<script src="../../../resources/testharness.js"></script>
<script src="../../../resources/testharnessreport.js"></script>
<script>
var testMouseKeyPressed = async_test('Tests that the mouse events with some keys pressed.');
var activeKeys = false;
window.addEventListener('pointermove', function(e) {
activeKeys = e.getModifierState("Alt") && e.getModifierState("Control") && e.getModifierState("Meta") && e.getModifierState("Shift") && e.getModifierState("CapsLock") && e.getModifierState("NumLock") && e.getModifierState("AltGraph");
});
function callbackValidKeysPressed() {
if (activeKeys) {
testMouseKeyPressed.done();
}
}
function inject_input() {
// First press Alt, Control, Meta, Shift, CapsLock, NumLock, AltGraph keys and then send a mouse move.
if (window.chrome && chrome.gpuBenchmarking) {
var pointerActions =
[{source: "mouse", id: 0,
actions: [
{ name: "pointerMove", x: 100, y: 100, keys: "Alt, Control, Meta, Shift, CapsLock, NumLock, AltGraph" }]}];
chrome.gpuBenchmarking.pointerActionSequence(pointerActions, callbackValidKeysPressed);
}
}
</script>
</head>
<body id="target" onload="inject_input()">
<h4>Test Description: Tests that the mouse events with some keys pressed.
<ol>
<li>Press Alt, Control, Meta, Shift, CapsLock, NumLock, AltGraph keys and move the mouse</li>
</ol>
</h4>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment