☠☠ backed out by 3a84a262f319 ☠ ☠ | |
author | Botond Ballo <botond@mozilla.com> |
Wed, 01 Jun 2016 19:56:49 -0400 | |
changeset 300207 | e2e57c225fd00677a1740c6546c1ef99389958dc |
parent 300206 | 8e6211a8cc26d964f0dd069e01ebc61ef23c7b45 |
child 300208 | 48e220d82d59a695d2b89db1aa70e47e14b7a412 |
push id | 77850 |
push user | bballo@mozilla.com |
push date | Thu, 02 Jun 2016 18:05:32 +0000 |
treeherder | mozilla-inbound@e2e57c225fd0 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | kats |
bugs | 1276107 |
milestone | 49.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
new file mode 100644 --- /dev/null +++ b/gfx/layers/apz/test/mochitest/helper_scroll_inactive_zindex.html @@ -0,0 +1,47 @@ +<head> + <meta name="viewport" content="width=device-width; initial-scale=1.0"> + <title>Wheel-scrolling over inactive subframe with z-index</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, and make sure that 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; + } + #scrolled { + width: 200px; + height: 1000px; /* so the subframe has room to scroll */ + z-index: 2; + background: linear-gradient(red, blue); /* so you can see it scroll */ + transform: translateZ(0px); /* to force active layers */ + will-change: transform; /* to force active layers */ + } + </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>
--- a/gfx/layers/apz/test/mochitest/mochitest.ini +++ b/gfx/layers/apz/test/mochitest/mochitest.ini @@ -16,16 +16,17 @@ support-files = helper_scroll_on_position_fixed.html helper_tap_passive.html helper_click.html helper_drag_click.html helper_bug1271432.html helper_touch_action.html helper_touch_action_regions.html helper_scroll_inactive_perspective.html + helper_scroll_inactive_zindex.html tags = apz [test_bug982141.html] [test_bug1151663.html] [test_wheel_scroll.html] skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet [test_wheel_transactions.html] skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet [test_bug1151667.html]
--- a/gfx/layers/apz/test/mochitest/test_group_wheelevents.html +++ b/gfx/layers/apz/test/mochitest/test_group_wheelevents.html @@ -17,17 +17,18 @@ var prefs = [ // 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_inactive_perspective.html', 'prefs': prefs}, + {'file': 'helper_scroll_inactive_zindex.html', 'prefs': prefs} ]; if (isApzEnabled()) { SimpleTest.waitForExplicitFinish(); window.onload = function() { runSubtestsSeriallyInFreshWindows(subtests) .then(SimpleTest.finish); };