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
Show 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> <!DOCTYPE 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"> <style type="text/css">
#scrollable { #scrollable {
height: 200px; height: 200px;
...@@ -8,25 +11,21 @@ ...@@ -8,25 +11,21 @@
font-size: 80px; font-size: 80px;
} }
</style> </style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script> <script>
function start() function start() {
{ testSetUp({
description('Check pan scroll by click mouse');
testPanScroll({
'clickOrDrag': 'click', 'clickOrDrag': 'click',
'scrollable': $('scrollable'), 'scrollable': $('scrollable'),
}); });
} }
</script> </script>
</head>
<body onload="start()"> <body onload="start()">
<div id="container"> <div id="container">
<p id="description"></p> <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 id="scrollable"></div>
</div> </div>
<div id="console"></div> <div id="console"></div>
</body> </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> <!DOCTYPE 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"> <style type="text/css">
#scrollable { #scrollable {
height: 200px; height: 200px;
...@@ -8,19 +11,15 @@ ...@@ -8,19 +11,15 @@
font-size: 80px; font-size: 80px;
} }
</style> </style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script> <script>
function start() function start() {
{ testSetUp({
description('Check pan scroll by drag mouse');
testPanScroll({
'clickOrDrag': 'drag', 'clickOrDrag': 'drag',
'scrollable': $('scrollable'), 'scrollable': $('scrollable'),
}); });
} }
</script> </script>
</head>
<body onload="start()"> <body onload="start()">
<div id="container"> <div id="container">
<p id="description"></p> <p id="description"></p>
...@@ -29,4 +28,3 @@ For manual testing, hold middle button in scrollable and move aroudn mouse point ...@@ -29,4 +28,3 @@ For manual testing, hold middle button in scrollable and move aroudn mouse point
</div> </div>
<div id="console"></div> <div id="console"></div>
</body> </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> <!DOCTYPE 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"> <style type="text/css">
#scrollable { #scrollable {
height: 200px; height: 200px;
...@@ -8,22 +11,22 @@ ...@@ -8,22 +11,22 @@
font-size: 80px; font-size: 80px;
} }
</style> </style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script> <script>
var mousedown_fired = false;
window.addEventListener('mousedown', function(event) { window.addEventListener('mousedown', function(event) {
mousedown_fired = true;
}); });
function start() function start() {
{ testSetUp({
description('Check pan scroll with mousedown event handler');
testPanScroll({
'clickOrDrag': 'drag', 'clickOrDrag': 'drag',
'scrollable': $('scrollable'), 'scrollable': $('scrollable'),
'finishTest': function() {
assert_true(mousedown_fired);
},
}); });
} }
</script> </script>
</head>
<body onload="start()"> <body onload="start()">
<div id="container"> <div id="container">
<p id="description"></p> <p id="description"></p>
...@@ -34,4 +37,3 @@ To test manually, try to pan scroll inside this div. ...@@ -34,4 +37,3 @@ To test manually, try to pan scroll inside this div.
</div> </div>
<div id="console"></div> <div id="console"></div>
</body> </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> <!DOCTYPE html>
<head> <script src="../../resources/testharness.js"></script>
<script src="../../resources/js-test.js"></script> <script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script> <script src="./resources/middleClickAutoscroll.js"></script>
<script> <script>
function start() { function start() {
description('Check pan scroll in iframe');
var iframe = $('iframe'); var iframe = $('iframe');
var offsetLeft = iframe.offsetLeft; var offsetLeft = iframe.offsetLeft;
var offsetTop = iframe.offsetTop; var offsetTop = iframe.offsetTop;
testPanScroll({ testSetUp({
'clickOrDrag': 'click', 'clickOrDrag': 'click',
'endX': offsetLeft + 5, 'endX': offsetLeft + 5,
'endY': offsetTop + 50, 'endY': offsetTop + 50,
'scrollable': iframe.contentDocument.body, 'scrollable': iframe.contentDocument.body,
'scrolledObject': iframe.contentWindow, 'scrolledObject': iframe.contentWindow.document.scrollingElement,
'startX': offsetLeft + 5, 'startX': offsetLeft + 5,
'startY': offsetTop + 5, 'startY': offsetTop + 5,
}); });
} }
</script> </script>
</head>
<body onload="start()"> <body onload="start()">
<div id="container"> <div id="container">
<p id="description"></p> <p id="description"></p>
<iframe id="iframe" width="640" height="100"></iframe> <iframe id="iframe" width="640" height="100"></iframe>
</div> </div>
</body> </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> <!DOCTYPE html>
<html> <script src="../../resources/testharness.js"></script>
<head> <script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/gesture-util.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<style type="text/css"> <style type="text/css">
div { div {
line-height: 50px; line-height: 50px;
...@@ -16,20 +18,17 @@ div { ...@@ -16,20 +18,17 @@ div {
padding: 5px; padding: 5px;
} }
</style> </style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script> <script>
function start() function start() {
{
outerdiv = $('outerdiv'); outerdiv = $('outerdiv');
testPanScroll({ testSetUp({
'clickOrDrag': 'drag', 'clickOrDrag': 'drag',
'endX': 225, 'endX': 225,
'endY': 75, 'endY': 75,
'finishTest': function() { 'finishTest': function() {
shouldNotBe('outerdiv.scrollLeft', '0'); assert_not_equals(outerdiv.scrollLeft, 0);
shouldBeZero('outerdiv.scrollTop'); assert_equals(outerdiv.scrollTop, 0);
}, },
'scrollable': outerdiv, 'scrollable': outerdiv,
'startX': 150, 'startX': 150,
...@@ -37,7 +36,6 @@ function start() ...@@ -37,7 +36,6 @@ function start()
}); });
} }
</script> </script>
</head>
<body onload="start()"> <body onload="start()">
<div id="outerdiv"> <div id="outerdiv">
<p>Top of outer div.</p> <p>Top of outer div.</p>
...@@ -49,4 +47,3 @@ function start() ...@@ -49,4 +47,3 @@ function start()
<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> <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> <div id="console"></div>
</body> </body>
</html>
third_party/WebKit/LayoutTests/fast/events/middleClickAutoscroll-nested-divs.html
View file @ e186dbf7
<html> <!DOCTYPE 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"> <style type="text/css">
#scrollable { #scrollable {
width:500px; width:500px;
height:300px; height:300px;
overflow:auto; overflow:auto;
border:2px solid red; border:2px solid red;
padding:10px"; padding:10px;
} }
</style> </style>
<script src="../../resources/js-test.js"></script>
<script src="./resources/middleClickAutoscroll.js"></script>
<script> <script>
function start() function start() {
{ testSetUp({
description('Check pan scroll in nested divs');
testPanScroll({
'clickOrDrag': 'click', 'clickOrDrag': 'click',
'scrollable': $('scrollable'), 'scrollable': $('scrollable'),
}); });
} }
</script> </script>
</head>
<body onload="start()"> <body onload="start()">
<div id="container"> <div id="container">
<p id="description"></p> <p id="description"></p>
...@@ -41,6 +41,4 @@ propagates correctly up the DOM tree. On success, our scroll offset should be no ...@@ -41,6 +41,4 @@ propagates correctly up the DOM tree. On success, our scroll offset should be no
</div> </div>
</div> </div>
</div> </div>
<div id="console"></div>
</body> </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 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) {
function $(id)
{
return document.getElementById(id); return document.getElementById(id);
} }
function testPanScroll(param) function testSetUp(param) {
{ scrollable = param.scrollable;
function finishTest() scrolledObject = param.scrolledObject || scrollable;
{ startX = param.startX || scrollable.offsetLeft + 5;
if ($('container')) startY = param.startY || scrollable.offsetTop + 5;
$('container').innerHTML = ''; endX = param.endX || scrollable.offsetLeft + 5;
if (param.finishTest) endY = param.endY || scrollable.offsetTop + middleClickAutoscrollRadius + 6;
param.finishTest(); autoscrollParam = param;
if (window.finishJSTest) {
finishJSTest();
return;
}
if (window.testRunner)
testRunner.notifyDone();
}
var scrollable = param.scrollable;
var scrolledObject = param.scrolledObject || scrollable;
if (!scrollable.innerHTML) { if (!scrollable.innerHTML) {
for (var i = 0; i < 100; ++i) { for (var i = 0; i < 100; ++i) {
var line = document.createElement('div'); var line = document.createElement('div');
...@@ -35,56 +27,39 @@ function testPanScroll(param) ...@@ -35,56 +27,39 @@ function testPanScroll(param)
scrollable.appendChild(line); scrollable.appendChild(line);
} }
} }
promise_test (async () => {
var noModeScroll = false; // Start atuoscrolling.
var scrolled = false; if (autoscrollParam.clickOrDrag == 'click') {
await mouseMoveTo(startX, startY);
scrolledObject.onscroll = function() { await mouseClickOn(startX, startY, 'middle');
if (noModeScroll) { await mouseMoveTo(endX, endY);
testFailed('still autoscroll'); } else {
finishTest(); assert_equals('drag', autoscrollParam.clickOrDrag);
return; mouseDragAndDrop(startX, startY, endX, endY, 'middle',
waitTimeBeforeMoveInSeconds);
} }
if (scrolled) // Wait for some scrolling, then end the autoscroll.
return; await waitFor(() => {
scrolled = true; return scrolledObject.scrollTop > 0 || scrolledObject.scrollLeft > 0;
testPassed('autoscroll started'); });
var cursorInfo = internals.getCurrentCursorInfo(); if (autoscrollParam.clickOrDrag == 'click')
debug("Mouse cursor shape: " + cursorInfo); await mouseClickOn(endX, endY, 'middle');
if (window.eventSender) {
if (param.clickOrDrag == 'click')
eventSender.mouseDown(middleButton);
eventSender.mouseUp(middleButton);
}
};
scrollable.ownerDocument.onmouseup = function(e) { // Wait for the cursor shape to go back to normal.
if (!scrolled || e.button != middleButton) await waitFor(() => {
return;
noMoreScroll = true;
window.setTimeout(function() {
testPassed('autoscroll stopped');
var cursorInfo = internals.getCurrentCursorInfo(); var cursorInfo = internals.getCurrentCursorInfo();
if (cursorInfo == "type=Pointer hotSpot=0,0" || cursorInfo == "type=IBeam hotSpot=0,0") return cursorInfo == "type=Pointer hotSpot=0,0" ||
testPassed('Mouse cursor cleared'); cursorInfo == "type=IBeam hotSpot=0,0";
else });
testFailed('Mouse cursor shape: ' + cursorInfo);
finishTest(); finishTest();
}, autoscrollInterval * 2); });
}; }
if (!window.eventSender) function finishTest() {
return; if ($('container'))
var startX = param.startX || scrollable.offsetLeft + 5; $('container').innerHTML = '';
var startY = param.startY || scrollable.offsetTop + 5; if (autoscrollParam.finishTest)
var endX = param.endX || scrollable.offsetLeft + 5; autoscrollParam.finishTest();
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);
} }
third_party/WebKit/LayoutTests/resources/gesture-util.js
View file @ e186dbf7
...@@ -242,7 +242,7 @@ function mousePressOn(x, y, t) { ...@@ -242,7 +242,7 @@ function mousePressOn(x, y, t) {
// Simulate a mouse drag and drop. mouse down at {start_x, start_y}, move to // Simulate a mouse drag and drop. mouse down at {start_x, start_y}, move to
// {end_x, end_y} and release. // {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) => { return new Promise((resolve, reject) => {
if (chrome && chrome.gpuBenchmarking) { if (chrome && chrome.gpuBenchmarking) {
let pointerActions = [{ let pointerActions = [{
...@@ -250,7 +250,9 @@ function mouseDragAndDrop(start_x, start_y, end_x, end_y, button = 'left') { ...@@ -250,7 +250,9 @@ function mouseDragAndDrop(start_x, start_y, end_x, end_y, button = 'left') {
actions: [ actions: [
{ 'name': 'pointerMove', 'x': start_x, 'y': start_y }, { 'name': 'pointerMove', 'x': start_x, 'y': start_y },
{ 'name': 'pointerDown', 'x': start_x, 'y': start_y, 'button': button }, { 'name': 'pointerDown', 'x': start_x, 'y': start_y, 'button': button },
{ 'name': 'pause', 'duration': t},
{ 'name': 'pointerMove', 'x': end_x, 'y': end_y }, { 'name': 'pointerMove', 'x': end_x, 'y': end_y },
{ 'name': 'pause', 'duration': t},
{ 'name': 'pointerUp', 'button': button }, { '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