Skip to content

GitLab

T
tangled
Commit e186dbf7 authored by Sahel Sharify's avatar Sahel Sharify Committed by Commit Bot
Browse files
Options

Convert middleClickAutoscroll.js to use gpu benchmarking 

This cl converts middleClickAutoscroll.js and the middle click autoscroll
layout tests that are using it to use gpu benchmarking.

Bug: 875945
Change-Id: Ic5acb4367dd406de3e5897063bfe6b1b44e7daa6
Reviewed-on: https://chromium-review.googlesource.com/1251901Reviewed-by: default avatarNavid Zolghadr <nzolghadr@chromium.org>
Commit-Queue: Sahel Sharify <sahel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595596}
parent b8ca53ab
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 260 deletions
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-click-expected.txt deleted 100644 → 0
View file @ b8ca53ab
PASS autoscroll started
Mouse cursor shape: type=SouthPanning hotSpot=0,0
PASS autoscroll stopped
PASS Mouse cursor cleared
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-click.html
View file @ e186dbf7
<html>
<head>
<!DOCTYPE html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<style type="text/css">
#scrollable {
height: 200px;
overflow: auto;
border: solid 3px #cc0000;
font-size: 80px;
height: 200px;
overflow: auto;
border: solid 3px #cc0000;
font-size: 80px;
}
</style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script>
function start()
{
description('Check pan scroll by click mouse');
testPanScroll({
'clickOrDrag': 'click',
'scrollable': $('scrollable'),
});
function start() {
testSetUp({
'clickOrDrag': 'click',
'scrollable': $('scrollable'),
});
}
</script>
</head>
<body onload="start()">
<div id="container">
<p id="description"></p>
For manual testing, hold middle button in scrollable and move aroudn mouse pointer for scrolling, then release middle button to stop scrolling.
For manual testing, click middle button in scrollable and move around mouse pointer for scrolling, then click middle button again to stop scrolling.
<div id="scrollable"></div>
</div>
<div id="console"></div>
</body>
</html>
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-drag-expected.txt deleted 100644 → 0
View file @ b8ca53ab
PASS autoscroll started
Mouse cursor shape: type=SouthPanning hotSpot=0,0
PASS autoscroll stopped
PASS Mouse cursor cleared
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-drag.html
View file @ e186dbf7
<html>
<head>
<!DOCTYPE html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<style type="text/css">
#scrollable {
height: 200px;
overflow: auto;
border: solid 3px #cc0000;
font-size: 80px;
height: 200px;
overflow: auto;
border: solid 3px #cc0000;
font-size: 80px;
}
</style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script>
function start()
{
description('Check pan scroll by drag mouse');
testPanScroll({
'clickOrDrag': 'drag',
'scrollable': $('scrollable'),
});
function start() {
testSetUp({
'clickOrDrag': 'drag',
'scrollable': $('scrollable'),
});
}
</script>
</head>
<body onload="start()">
<div id="container">
<p id="description"></p>
......@@ -29,4 +28,3 @@ For manual testing, hold middle button in scrollable and move aroudn mouse point
</div>
<div id="console"></div>
</body>
</html>
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-event-fired-expected.txt deleted 100644 → 0
View file @ b8ca53ab
PASS autoscroll started
Mouse cursor shape: type=SouthPanning hotSpot=0,0
PASS autoscroll stopped
PASS Mouse cursor cleared
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-event-fired.html
View file @ e186dbf7
<html>
<head>
<!DOCTYPE html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<style type="text/css">
#scrollable {
height: 200px;
overflow: auto;
border: solid 3px #cc0000;
font-size: 80px;
height: 200px;
overflow: auto;
border: solid 3px #cc0000;
font-size: 80px;
}
</style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script>
var mousedown_fired = false;
window.addEventListener('mousedown', function(event) {
mousedown_fired = true;
});
function start()
{
description('Check pan scroll with mousedown event handler');
testPanScroll({
'clickOrDrag': 'drag',
'scrollable': $('scrollable'),
});
function start() {
testSetUp({
'clickOrDrag': 'drag',
'scrollable': $('scrollable'),
'finishTest': function() {
assert_true(mousedown_fired);
},
});
}
</script>
</head>
<body onload="start()">
<div id="container">
<p id="description"></p>
......@@ -34,4 +37,3 @@ To test manually, try to pan scroll inside this div.
</div>
<div id="console"></div>
</body>
</html>
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-in-iframe-expected.txt deleted 100644 → 0
View file @ b8ca53ab
PASS autoscroll started
Mouse cursor shape: type=SouthPanning hotSpot=0,0
PASS autoscroll stopped
PASS Mouse cursor cleared
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-in-iframe.html
View file @ e186dbf7
<html>
<head>
<script src="../../resources/js-test.js"></script>
<!DOCTYPE html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script>
function start() {
var iframe = $('iframe');
var offsetLeft = iframe.offsetLeft;
var offsetTop = iframe.offsetTop;
description('Check pan scroll in iframe');
var iframe = $('iframe');
var offsetLeft = iframe.offsetLeft;
var offsetTop = iframe.offsetTop;
testPanScroll({
'clickOrDrag': 'click',
'endX': offsetLeft + 5,
'endY': offsetTop + 50,
'scrollable': iframe.contentDocument.body,
'scrolledObject': iframe.contentWindow,
'startX': offsetLeft + 5,
'startY': offsetTop + 5,
});
testSetUp({
'clickOrDrag': 'click',
'endX': offsetLeft + 5,
'endY': offsetTop + 50,
'scrollable': iframe.contentDocument.body,
'scrolledObject': iframe.contentWindow.document.scrollingElement,
'startX': offsetLeft + 5,
'startY': offsetTop + 5,
});
}
</script>
</head>
<body onload="start()">
<div id="container">
<p id="description"></p>
<iframe id="iframe" width="640" height="100"></iframe>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-nested-divs-expected.txt deleted 100644 → 0
View file @ b8ca53ab
PASS autoscroll started
Mouse cursor shape: type=SouthPanning hotSpot=0,0
PASS autoscroll stopped
PASS Mouse cursor cleared
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-nested-divs-forbidden-expected.txt deleted 100644 → 0
View file @ b8ca53ab
Top of outer div.
Inner div.
Bottom of outer div.
Test for bug 232965 This tests that vertical pan scrolling does not propagate from the inner div to the outer div when the outer div has no vertical overflow.
PASS autoscroll started
Mouse cursor shape: type=NorthEastPanning hotSpot=0,0
PASS autoscroll stopped
PASS Mouse cursor cleared
PASS outerdiv.scrollLeft is not 0
PASS outerdiv.scrollTop is 0
PASS successfullyParsed is true
TEST COMPLETE
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-nested-divs-forbidden.html
View file @ e186dbf7
<!DOCTYPE html>
<html>
<head>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<style type="text/css">
div {
line-height: 50px;
line-height: 50px;
}
#outerdiv {
overflow:auto;
border: 2px solid #000FFF;
overflow:auto;
border: 2px solid #000FFF;
}
#innerdiv {
overflow:auto;
border: 2px solid #000000;
width: 121%;
padding: 5px;
overflow:auto;
border: 2px solid #000000;
width: 121%;
padding: 5px;
}
</style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script>
function start()
{
function start() {
outerdiv = $('outerdiv');
testPanScroll({
testSetUp({
'clickOrDrag': 'drag',
'endX': 225,
'endY': 75,
'finishTest': function() {
shouldNotBe('outerdiv.scrollLeft', '0');
shouldBeZero('outerdiv.scrollTop');
assert_not_equals(outerdiv.scrollLeft, 0);
assert_equals(outerdiv.scrollTop, 0);
},
'scrollable': outerdiv,
'startX': 150,
......@@ -37,16 +36,14 @@ function start()
});
}
</script>
</head>
<body onload="start()">
<div id="outerdiv">
<p>Top of outer div.</p>
<div id="innerdiv">
<p>Inner div.</p>
</div>
<p>Bottom of outer div.</p>
<p>Top of outer div.</p>
<div id="innerdiv">
<p>Inner div.</p>
</div>
<p>Bottom of outer div.</p>
</div>
<p>Test for <a href="http://crbug.com/232965">bug 232965</a> This tests that vertical pan scrolling does not propagate from the inner div to the outer div when the outer div has no vertical overflow.</p>
<div id="console"></div>
</body>
</html>
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-nested-divs.html
View file @ e186dbf7
<html>
<head>
<!DOCTYPE html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<style type="text/css">
#scrollable {
width:500px;
height:300px;
overflow:auto;
border:2px solid red;
padding:10px";
width:500px;
height:300px;
overflow:auto;
border:2px solid red;
padding:10px;
}
</style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script>
function start()
{
description('Check pan scroll in nested divs');
testPanScroll({
'clickOrDrag': 'click',
'scrollable': $('scrollable'),
});
function start() {
testSetUp({
'clickOrDrag': 'click',
'scrollable': $('scrollable'),
});
}
</script>
</head>
<body onload="start()">
<div id="container">
<p id="description"></p>
Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=28023">bug 28023</a> This tests that pan scrolling
propagates correctly up the DOM tree. On success, our scroll offset should be non-zero.
<div id="scrollable">
<div style="height:200px; position:relative;">
<div style="height:150px; border:1px blue solid; overflow:auto;">
Panscrolling starting in the blue box should scroll the outer div.
</div>
Panscrolling outside the blue boxes should scroll the outer div.
<div style="height:200px; position:relative;">
<div style="height:150px; border:1px blue solid; overflow:auto;">
Panscrolling starting in the blue box should scroll the outer div.
</div>
<div style="height:200px; position:relative;">
<div style="height:150px; border:1px blue solid; overflow:auto;">
Panscrolling starting in the blue box should scroll the outer div.
</div>
Panscrolling outside the blue boxes should scroll the outer div.
</div>
<div style="height:200px; position:relative;">
<div style="height:150px; border:1px blue solid; overflow:auto;">
Panscrolling starting in the blue box should scroll the outer div.
</div>
</div>
</div>
</div>
<div id="console"></div>
</body>
</html>
third_party/WebKit/LayoutTests/fast/events/resources/middleClickAutoscroll.js
View file @ e186dbf7
var autoscrollInterval = 50;
var middleButton = 1;
var middleClickAutoscrollRadius = 15; // from FrameView::noPanScrollRadius
var waitTimeBeforeMoveInSeconds = 0.1;
var scrollable;
var scrolledObject;
var startX;
var startY;
var endX;
var endY;
var autoscrollParam;
window.jsTestIsAsync = true;
function $(id)
{
return document.getElementById(id);
function $(id) {
return document.getElementById(id);
}
function testPanScroll(param)
{
function finishTest()
{
if ($('container'))
$('container').innerHTML = '';
if (param.finishTest)
param.finishTest();
if (window.finishJSTest) {
finishJSTest();
return;
}
if (window.testRunner)
testRunner.notifyDone();
function testSetUp(param) {
scrollable = param.scrollable;
scrolledObject = param.scrolledObject || scrollable;
startX = param.startX || scrollable.offsetLeft + 5;
startY = param.startY || scrollable.offsetTop + 5;
endX = param.endX || scrollable.offsetLeft + 5;
endY = param.endY || scrollable.offsetTop + middleClickAutoscrollRadius + 6;
autoscrollParam = param;
if (!scrollable.innerHTML) {
for (var i = 0; i < 100; ++i) {
var line = document.createElement('div');
line.innerHTML = "line " + i;
scrollable.appendChild(line);
}
var scrollable = param.scrollable;
var scrolledObject = param.scrolledObject || scrollable;
if (!scrollable.innerHTML) {
for (var i = 0; i < 100; ++i) {
var line = document.createElement('div');
line.innerHTML = "line " + i;
scrollable.appendChild(line);
}
}
promise_test (async () => {
// Start atuoscrolling.
if (autoscrollParam.clickOrDrag == 'click') {
await mouseMoveTo(startX, startY);
await mouseClickOn(startX, startY, 'middle');
await mouseMoveTo(endX, endY);
} else {
assert_equals('drag', autoscrollParam.clickOrDrag);
mouseDragAndDrop(startX, startY, endX, endY, 'middle',
waitTimeBeforeMoveInSeconds);
}
var noModeScroll = false;
var scrolled = false;
scrolledObject.onscroll = function() {
if (noModeScroll) {
testFailed('still autoscroll');
finishTest();
return;
}
// Wait for some scrolling, then end the autoscroll.
await waitFor(() => {
return scrolledObject.scrollTop > 0 || scrolledObject.scrollLeft > 0;
});
if (autoscrollParam.clickOrDrag == 'click')
await mouseClickOn(endX, endY, 'middle');
if (scrolled)
return;
scrolled = true;
testPassed('autoscroll started');
var cursorInfo = internals.getCurrentCursorInfo();
debug("Mouse cursor shape: " + cursorInfo);
// Wait for the cursor shape to go back to normal.
await waitFor(() => {
var cursorInfo = internals.getCurrentCursorInfo();
return cursorInfo == "type=Pointer hotSpot=0,0" ||
cursorInfo == "type=IBeam hotSpot=0,0";
});
if (window.eventSender) {
if (param.clickOrDrag == 'click')
eventSender.mouseDown(middleButton);
eventSender.mouseUp(middleButton);
}
};
scrollable.ownerDocument.onmouseup = function(e) {
if (!scrolled || e.button != middleButton)
return;
noMoreScroll = true;
window.setTimeout(function() {
testPassed('autoscroll stopped');
var cursorInfo = internals.getCurrentCursorInfo();
if (cursorInfo == "type=Pointer hotSpot=0,0" || cursorInfo == "type=IBeam hotSpot=0,0")
testPassed('Mouse cursor cleared');
else
testFailed('Mouse cursor shape: ' + cursorInfo);
finishTest();
}, autoscrollInterval * 2);
};
finishTest();
});
}
if (!window.eventSender)
return;
var startX = param.startX || scrollable.offsetLeft + 5;
var startY = param.startY || scrollable.offsetTop + 5;
var endX = param.endX || scrollable.offsetLeft + 5;
var endY = param.endY || scrollable.offsetTop + middleClickAutoscrollRadius + 6;
eventSender.mouseMoveTo(startX, startY);
eventSender.mouseDown(middleButton);
if (param.clickOrDrag == 'click')
eventSender.mouseUp(middleButton);
eventSender.mouseMoveTo(endX, endY);
function finishTest() {
if ($('container'))
$('container').innerHTML = '';
if (autoscrollParam.finishTest)
autoscrollParam.finishTest();
}
third_party/WebKit/LayoutTests/resources/gesture-util.js
View file @ e186dbf7
......@@ -242,7 +242,7 @@ function mousePressOn(x, y, t) {
// Simulate a mouse drag and drop. mouse down at {start_x, start_y}, move to
// {end_x, end_y} and release.
function mouseDragAndDrop(start_x, start_y, end_x, end_y, button = 'left') {
function mouseDragAndDrop(start_x, start_y, end_x, end_y, button = 'left', t = 0) {
return new Promise((resolve, reject) => {
if (chrome && chrome.gpuBenchmarking) {
let pointerActions = [{
......@@ -250,7 +250,9 @@ function mouseDragAndDrop(start_x, start_y, end_x, end_y, button = 'left') {
actions: [
{ 'name': 'pointerMove', 'x': start_x, 'y': start_y },
{ 'name': 'pointerDown', 'x': start_x, 'y': start_y, 'button': button },
{ 'name': 'pause', 'duration': t},
{ 'name': 'pointerMove', 'x': end_x, 'y': end_y },
{ 'name': 'pause', 'duration': t},
{ 'name': 'pointerUp', 'button': button },
]
}];
......
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