Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 18:27:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4274430f48d6 (bug 1787560) for causing failures at browser_test_scroll_thumb_dragging.js. CLOSED TREE

Browse Source
This commit is contained in:
Butkovits Atila 2022-08-31 03:16:26 +03:00
parent dd71174172
commit bbbce97998
3 changed files with 36 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
View File

@ -1293,25 +1293,6 @@ function promiseMoveMouseAndScrollWheelOver(
return p;
}
function scrollbarDragStart(aTarget, aScaleFactor) {
var targetElement = elementForTarget(aTarget);
var w = {},
h = {};
utilsForTarget(aTarget).getScrollbarSizes(targetElement, w, h);
var verticalScrollbarWidth = w.value;
if (verticalScrollbarWidth == 0) {
return null;
}
var upArrowHeight = verticalScrollbarWidth; // assume square scrollbar buttons
var startX = targetElement.clientWidth + verticalScrollbarWidth / 2;
var startY = upArrowHeight + 5; // start dragging somewhere in the thumb
startX *= aScaleFactor;
startY *= aScaleFactor;
return { x: startX, y: startY };
}
// Synthesizes events to drag |target|'s vertical scrollbar by the distance
// specified, synthesizing a mousemove for each increment as specified.
// Returns null if the element doesn't have a vertical scrollbar. Otherwise,
@ -1320,7 +1301,7 @@ function scrollbarDragStart(aTarget, aScaleFactor) {
// processed by the widget code can be detected by listening for the mousemove
// events in the caller, or for some other event that is triggered by the
// mousemove, such as the scroll event resulting from the scrollbar drag.
// The aScaleFactor argument should be provided if the scrollframe has been
// The scaleFactor argument should be provided if the scrollframe has been
// scaled by an enclosing CSS transform. (TODO: this is a workaround for the
// fact that coordinatesRelativeToScreen is supposed to do this automatically
// but it currently does not).
@ -1328,22 +1309,31 @@ function scrollbarDragStart(aTarget, aScaleFactor) {
// with modifications. Fixes here should be copied there if appropriate.
// |target| can be an element (for subframes) or a window (for root frames).
async function promiseVerticalScrollbarDrag(
aTarget,
aDistance = 20,
aIncrement = 5,
aScaleFactor = 1
target,
distance = 20,
increment = 5,
scaleFactor = 1
) {
var startPoint = scrollbarDragStart(aTarget, aScaleFactor);
var targetElement = elementForTarget(aTarget);
if (startPoint == null) {
var targetElement = elementForTarget(target);
var w = {},
h = {};
utilsForTarget(target).getScrollbarSizes(targetElement, w, h);
var verticalScrollbarWidth = w.value;
if (verticalScrollbarWidth == 0) {
return null;
}
var upArrowHeight = verticalScrollbarWidth; // assume square scrollbar buttons
var mouseX = targetElement.clientWidth + verticalScrollbarWidth / 2;
var mouseY = upArrowHeight + 5; // start dragging somewhere in the thumb
mouseX *= scaleFactor;
mouseY *= scaleFactor;
dump(
"Starting drag at " +
startPoint.x +
mouseX +
", " +
startPoint.y +
mouseY +
" from top-left of #" +
targetElement.id +
"\n"
@ -1351,31 +1341,31 @@ async function promiseVerticalScrollbarDrag(
// Move the mouse to the scrollbar thumb and drag it down
await promiseNativeMouseEventWithAPZ({
aTarget,
offsetX: startPoint.x,
offsetY: startPoint.y,
target,
offsetX: mouseX,
offsetY: mouseY,
type: "mousemove",
});
// mouse down
await promiseNativeMouseEventWithAPZ({
aTarget,
offsetX: startPoint.x,
offsetY: startPoint.y,
target,
offsetX: mouseX,
offsetY: mouseY,
type: "mousedown",
});
// drag vertically by |aIncrement| until we reach the specified distance
for (var y = aIncrement; y < aDistance; y += aIncrement) {
// drag vertically by |increment| until we reach the specified distance
for (var y = increment; y < distance; y += increment) {
await promiseNativeMouseEventWithAPZ({
aTarget,
offsetX: startPoint.x,
offsetY: startPoint.y + y,
target,
offsetX: mouseX,
offsetY: mouseY + y,
type: "mousemove",
});
}
await promiseNativeMouseEventWithAPZ({
aTarget,
offsetX: startPoint.x,
offsetY: startPoint.y + aDistance,
target,
offsetX: mouseX,
offsetY: mouseY + distance,
type: "mousemove",
});
@ -1383,50 +1373,14 @@ async function promiseVerticalScrollbarDrag(
return async function() {
dump("Finishing drag of #" + targetElement.id + "\n");
await promiseNativeMouseEventWithAPZ({
aTarget,
offsetX: startPoint.x,
offsetY: startPoint.y + aDistance,
target,
offsetX: mouseX,
offsetY: mouseY + distance,
type: "mouseup",
});
};
}
// This is similar to promiseVerticalScrollbarDrag except this triggers
// the vertical scrollbar drag with a touch drag input. This function
// returns true if a scrollbar was present and false if no scrollbar
// was found for the given element.
async function promiseVerticalScrollbarTouchDrag(
aTarget,
aDistance = 20,
aScaleFactor = 1
) {
var startPoint = scrollbarDragStart(aTarget, aScaleFactor);
var targetElement = elementForTarget(aTarget);
if (startPoint == null) {
return false;
}
dump(
"Starting touch drag at " +
startPoint.x +
", " +
startPoint.y +
" from top-left of #" +
targetElement.id +
"\n"
);
await promiseNativeTouchDrag(
aTarget,
startPoint.x,
startPoint.y,
0,
aDistance
);
return true;
}
// Synthesizes a native mouse drag, starting at offset (mouseX, mouseY) from
// the given target. The drag occurs in the given number of steps, to a final
// destination of (mouseX + distanceX, mouseY + distanceY) from the target.

51
gfx/layers/apz/test/mochitest/helper_touch_drag_root_scrollbar.html
View File

@ -1,51 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width; initial-scale=1.0">
<title>Touch Drag on the viewport's scrollbar</title>
<script type="application/javascript" src="apz_test_native_event_utils.js"></script>
<script type="application/javascript" src="apz_test_utils.js"></script>
<script src="/tests/SimpleTest/paint_listener.js"></script>
<style>
.content {
width: 1000px;
height: 5000px;
}
</style>
<script type="text/javascript">
async function test() {
let transformEndPromise = promiseTransformEnd();
let scrollbarPresent = await promiseVerticalScrollbarTouchDrag(window, 20);
if (!scrollbarPresent) {
ok(true, "No scrollbar, can't do this test");
return;
}
await transformEndPromise;
// Flush everything just to be safe
await promiseOnlyApzControllerFlushed();
// After dragging the scrollbar 20px on a 1000px-high viewport, we should
// have scrolled approx 2% of the 5000px high content. There might have been
// scroll arrows and such so let's just have a minimum bound of 50px to be safe.
ok(window.scrollY > 50, "Scrollbar drag resulted in a vertical scroll position of " + window.scrollY);
// Check that we did not get spurious horizontal scrolling, as we might if the
// drag gesture is mishandled by content as a select-drag rather than a scrollbar
// drag.
is(window.scrollX, 0, "Scrollbar drag resulted in a horizontal scroll position of " + window.scrollX);
}
waitUntilApzStable()
.then(test)
.then(subtestDone, subtestFailed);
</script>
</head>
<body>
<div class="content">Some content to ensure the root scrollframe is scrollable</div>
</body>
</html>

2
gfx/layers/apz/test/mochitest/test_group_touchevents-5.html
View File

@ -13,8 +13,6 @@
var subtests = [
// tests that scrolling doesn't cause extra SchedulePaint calls
{"file": "helper_bug1669625.html", "dp_suppression": false},
{"file": "helper_touch_drag_root_scrollbar.html", "prefs": [["apz.allow_zooming", true]]},
{"file": "helper_touch_drag_root_scrollbar.html", "prefs": [["apz.allow_zooming", false]]},
// Add new subtests here. If this starts timing out because it's taking too
// long, create a test_group_touchevents-6.html file. Refer to 1423011#c57