Skip to content

GitLab

T
tangled
Commit aaa87cea authored by Lan Wei's avatar Lan Wei Committed by Commit Bot
Browse files
Options

Clean all the functions that uses gpuBenchmarking for wpt tests 

We should try to use Testdriver Action API (an implementation of
Webdriver Action API) in all the web platform tests, not
gpuBenchmarking any more, because we are using Webdriver Action API on
wpt serve to run all the wpt tests.

Bug: 1054022
Change-Id: Id70be3776a2935e95de7e0a32e73f65cda009e3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2064182Reviewed-by: default avatarNavid Zolghadr <nzolghadr@chromium.org>
Commit-Queue: Lan Wei <lanwei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742730}
parent fbdbe39e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 165 deletions
third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_common_input.js
View file @ aaa87cea
...@@ -3,12 +3,6 @@ ...@@ -3,12 +3,6 @@
const scrollOffset = 20; const scrollOffset = 20;
const boundaryOffset = 2; const boundaryOffset = 2;
function delayPromise(delay) {
return new Promise(function(resolve, reject) {
window.setTimeout(resolve, delay);
});
}
function scrollPageIfNeeded(targetSelector, targetDocument) { function scrollPageIfNeeded(targetSelector, targetDocument) {
var target = targetDocument.querySelector(targetSelector); var target = targetDocument.querySelector(targetSelector);
var targetRect = target.getBoundingClientRect(); var targetRect = target.getBoundingClientRect();
...@@ -72,43 +66,6 @@ function mouseMoveIntoTarget(targetSelector, targetFrame) { ...@@ -72,43 +66,6 @@ function mouseMoveIntoTarget(targetSelector, targetFrame) {
}); });
} }
function mouseChordedButtonPress(targetSelector) {
return new Promise(function(resolve, reject) {
if (window.chrome && chrome.gpuBenchmarking) {
scrollPageIfNeeded(targetSelector, document);
var target = document.querySelector(targetSelector);
var targetRect = target.getBoundingClientRect();
var xPosition = targetRect.left + boundaryOffset;
var yPosition = targetRect.top + boundaryOffset;
const leftButton = 0;
const middleButton = 1;
chrome.gpuBenchmarking.pointerActionSequence(
[{
source: 'mouse',
actions: [
{
name: 'pointerDown',
x: xPosition,
y: yPosition,
button: leftButton
},
{
name: 'pointerDown',
x: xPosition,
y: yPosition,
button: middleButton
},
{name: 'pointerUp', button: middleButton},
{name: 'pointerUp', button: leftButton}
]
}],
resolve);
} else {
reject();
}
});
}
function mouseClickInTarget(targetSelector, targetFrame, button, shouldScrollToTarget = true) { function mouseClickInTarget(targetSelector, targetFrame, button, shouldScrollToTarget = true) {
var targetDocument = document; var targetDocument = document;
var frameLeft = 0; var frameLeft = 0;
...@@ -208,47 +165,6 @@ function mouseWheelScroll(targetSelector, direction) { ...@@ -208,47 +165,6 @@ function mouseWheelScroll(targetSelector, direction) {
}); });
} }
// Request a pointer lock and capture.
function mouseRequestPointerLockAndCaptureInTarget(targetSelector, targetFrame) {
var targetDocument = document;
var frameLeft = 0;
var frameTop = 0;
// Initialize the button value to left button.
var button = 0;
if (targetFrame !== undefined) {
targetDocument = targetFrame.contentDocument;
var frameRect = targetFrame.getBoundingClientRect();
frameLeft = frameRect.left;
frameTop = frameRect.top;
}
return new Promise(function(resolve, reject) {
if (window.chrome && chrome.gpuBenchmarking) {
scrollPageIfNeeded(targetSelector, targetDocument);
var target = targetDocument.querySelector(targetSelector);
var targetRect = target.getBoundingClientRect();
var xPosition = frameLeft + targetRect.left + boundaryOffset;
var yPosition = frameTop + targetRect.top + boundaryOffset;
chrome.gpuBenchmarking.pointerActionSequence( [
{source: 'mouse',
actions: [
{name: 'pointerMove', x: xPosition, y: yPosition},
{name: 'pointerDown', x: xPosition, y: yPosition, button: button},
{name: 'pointerMove', x: xPosition + 30, y: yPosition + 30},
{name: 'pointerMove', x: xPosition + 30, y: yPosition},
{name: 'pointerMove', x: xPosition + 60, y: yPosition + 30},
{name: 'pointerMove', x: xPosition + 30, y: yPosition + 20},
{name: 'pointerMove', x: xPosition + 10, y: yPosition + 50},
{name: 'pointerMove', x: xPosition + 40, y: yPosition + 10},
{name: 'pointerMove', x: xPosition + 10, y: yPosition + 50},
{name: 'pointerMove', x: xPosition + 40, y: yPosition + 10},
]}], resolve);
} else {
reject();
}
});
}
// Touch inputs. // Touch inputs.
function touchTapInTarget(targetSelector, targetFrame) { function touchTapInTarget(targetSelector, targetFrame) {
var targetDocument = document; var targetDocument = document;
...@@ -396,33 +312,6 @@ function penMoveToDocument() { ...@@ -396,33 +312,6 @@ function penMoveToDocument() {
}); });
} }
function penMoveIntoTarget(targetSelector, targetFrame) {
var targetDocument = document;
var frameLeft = 0;
var frameTop = 0;
if (targetFrame !== undefined) {
targetDocument = targetFrame.contentDocument;
var frameRect = targetFrame.getBoundingClientRect();
frameLeft = frameRect.left;
frameTop = frameRect.top;
}
return new Promise(function(resolve, reject) {
if (window.chrome && chrome.gpuBenchmarking) {
var target = targetDocument.querySelector(targetSelector);
var targetRect = target.getBoundingClientRect();
var xPosition = frameLeft + targetRect.left + boundaryOffset;
var yPosition = frameTop + targetRect.top + boundaryOffset;
chrome.gpuBenchmarking.pointerActionSequence( [
{source: 'pen',
actions: [
{ name: 'pointerMove', x: xPosition, y: yPosition}
]}], resolve);
} else {
reject();
}
});
}
function penEnterAndLeaveTarget(targetSelector, targetFrame) { function penEnterAndLeaveTarget(targetSelector, targetFrame) {
var targetDocument = document; var targetDocument = document;
var frameLeft = 0; var frameLeft = 0;
...@@ -452,36 +341,6 @@ function penEnterAndLeaveTarget(targetSelector, targetFrame) { ...@@ -452,36 +341,6 @@ function penEnterAndLeaveTarget(targetSelector, targetFrame) {
}); });
} }
function penClickInTarget(targetSelector, targetFrame) {
var targetDocument = document;
var frameLeft = 0;
var frameTop = 0;
if (targetFrame !== undefined) {
targetDocument = targetFrame.contentDocument;
var frameRect = targetFrame.getBoundingClientRect();
frameLeft = frameRect.left;
frameTop = frameRect.top;
}
return new Promise(function(resolve, reject) {
if (window.chrome && chrome.gpuBenchmarking) {
scrollPageIfNeeded(targetSelector, targetDocument);
var target = targetDocument.querySelector(targetSelector);
var targetRect = target.getBoundingClientRect();
var xPosition = frameLeft + targetRect.left + boundaryOffset;
var yPosition = frameTop + targetRect.top + boundaryOffset;
chrome.gpuBenchmarking.pointerActionSequence( [
{source: 'pen',
actions: [
{ name: 'pointerMove', x: xPosition, y: yPosition },
{ name: 'pointerDown', x: xPosition, y: yPosition },
{ name: 'pointerUp' }
]}], resolve);
} else {
reject();
}
});
}
// Drag and drop actions // Drag and drop actions
function mouseDragAndDropInTargets(targetSelectorList) { function mouseDragAndDropInTargets(targetSelectorList) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
...@@ -510,30 +369,6 @@ function mouseDragAndDropInTargets(targetSelectorList) { ...@@ -510,30 +369,6 @@ function mouseDragAndDropInTargets(targetSelectorList) {
}); });
} }
function smoothDrag(targetSelector1, targetSelector2, pointerType) {
return new Promise(function(resolve, reject) {
if (window.chrome && chrome.gpuBenchmarking) {
scrollPageIfNeeded(targetSelector1, document);
var target1 = document.querySelector(targetSelector1);
var targetRect1 = target1.getBoundingClientRect();
var xPosition1 = targetRect1.left + boundaryOffset;
var yPosition1 = targetRect1.top + boundaryOffset;
var target2 = document.querySelector(targetSelector2);
var targetRect2 = target2.getBoundingClientRect();
var xPosition2 = targetRect2.left + boundaryOffset;
var yPosition2 = targetRect2.top + boundaryOffset;
var action = '[{"source": "' + pointerType + '", "actions": [{ "name": "pointerDown", "x":' + xPosition1 +', "y":' + yPosition1 +' },';
var maxStep = Math.max(1, Math.floor(Math.max(Math.abs(xPosition2 - xPosition1), Math.abs(yPosition2 - yPosition1))/15));
for (var step=1; step<=maxStep; step++)
action += '{ "name": "pointerMove", "x":' + (xPosition1 + Math.floor((step/maxStep)*(xPosition2 - xPosition1))) +', "y":' + (yPosition1 + Math.floor((step/maxStep)*(yPosition2 - yPosition1))) +' },';
action += '{ "name": "pointerUp" }]}]';
chrome.gpuBenchmarking.pointerActionSequence(JSON.parse(action), resolve);
} else {
reject();
}
});
}
{ {
var pointerevent_automation = async_test("PointerEvent Automation"); var pointerevent_automation = async_test("PointerEvent Automation");
// Defined in every test and should return a promise that gets resolved when input is finished. // Defined in every test and should return a promise that gets resolved when input is finished.
......
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