Backed out changeset 8e6211a8cc26 (bug 1276107)

This commit is contained in:
Sebastian Hengst 2016-06-02 22:54:31 +02:00
Родитель 81c60dd743
Коммит 806cf3797f
3 изменённых файлов: 14 добавлений и 61 удалений

Просмотреть файл

@ -1,46 +0,0 @@
<head>
<meta name="viewport" content="width=device-width; initial-scale=1.0">
<title>Wheel-scrolling over inactive subframe with perspective</title>
<script type="application/javascript" src="apz_test_native_event_utils.js"></script>
<script type="application/javascript" src="apz_test_utils.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/paint_listener.js"></script>
<script type="application/javascript">
function* test(testDriver) {
var subframe = document.getElementById('scroll');
// scroll over the middle of the subframe, to make sure it scrolls,
// not the page
var scrollPos = subframe.scrollTop;
yield moveMouseAndScrollWheelOver(subframe, 100, 100, testDriver);
dump("after scroll, subframe.scrollTop = " + subframe.scrollTop + "\n");
ok(subframe.scrollTop > scrollPos, "subframe scrolled after wheeling over it");
}
waitUntilApzStable()
.then(runContinuation(test))
.then(subtestDone);
</script>
<style>
#scroll {
width: 200px;
height: 200px;
overflow: scroll;
perspective: 400px;
}
#scrolled {
width: 200px;
height: 1000px; /* so the subframe has room to scroll */
background: linear-gradient(red, blue); /* so you can see it scroll */
transform: translateZ(0px); /* so the perspective makes it to the display list */
}
</style>
</head>
<body>
<div id="scroll">
<div id="scrolled"></div>
</div>
<div style="height: 5000px;"></div><!-- So the page is scrollable as well -->
</body>
</head>

Просмотреть файл

@ -20,7 +20,6 @@ support-files =
helper_bug1271432.html
helper_touch_action.html
helper_touch_action_regions.html
helper_scroll_inactive_perspective.html
tags = apz
[test_bug982141.html]
[test_bug1151663.html]

Просмотреть файл

@ -8,21 +8,21 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript">
var prefs = [
// turn off smooth scrolling so that we don't have to wait for
// APZ animations to finish before sampling the scroll offset
['general.smoothScroll', false],
// ensure that any mouse movement will trigger a new wheel transaction,
// because in this test we move the mouse a bunch and want to recalculate
// the target APZC after each such movement.
['mousewheel.transaction.ignoremovedelay', 0],
['mousewheel.transaction.timeout', 0]
]
var subtests = [
{'file': 'helper_scroll_on_position_fixed.html', 'prefs': prefs},
{'file': 'helper_bug1271432.html', 'prefs': prefs},
{'file': 'helper_scroll_inactive_perspective.html', 'prefs': prefs}
{'file': 'helper_scroll_on_position_fixed.html', 'prefs': [
// turn off smooth scrolling so that we don't have to wait for
// APZ animations to finish before sampling the scroll offset
['general.smoothScroll', false],
// ensure that any mouse movement will trigger a new wheel transaction,
// because in this test we move the mouse a bunch and want to recalculate
// the target APZC after each such movement.
['mousewheel.transaction.ignoremovedelay', 0],
['mousewheel.transaction.timeout', 0]]},
{'file': 'helper_bug1271432.html', 'prefs': [
// same prefs as in the previous test, for the same reasons.
['general.smoothScroll', false],
['mousewheel.transaction.ignoremovedelay', 0],
['mousewheel.transaction.timeout', 0]]}
];
if (isApzEnabled()) {