Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1237905 - Remove logging added temporarily to test_wheel_transactions to diagnose an intermittent failure. r=kats

Browse Source 
MozReview-Commit-ID: JkuMXoTDXbL
This commit is contained in:
Botond Ballo 2016-02-21 14:43:52 -05:00
parent 9d337e3cc5
commit ceceabf821
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,14 +117,10 @@ function synthesizeNativeWheelAndWaitForWheelEvent(aElement, aX, aY, aDeltaX, aD
// If the event targets content in a subdocument, |aElement| should be inside
// the subdocument. See synthesizeNativeWheel for details on the other
// parameters.
var scrollActionId = 0;
function synthesizeNativeWheelAndWaitForScrollEvent(aElement, aX, aY, aDeltaX, aDeltaY, aCallback) {
scrollActionId++;
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] initiating scroll action " + scrollActionId + "\n");
var targetWindow = aElement.ownerDocument.defaultView;
var useCapture = true; // scroll events don't always bubble
targetWindow.addEventListener("scroll", function scrollWaiter(e) {
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] scroll action " + scrollActionId + ": received scroll event, target is " + e.target + " with id " + e.target.id + "\n");
targetWindow.removeEventListener("scroll", scrollWaiter, useCapture);
setTimeout(aCallback, 0);
}, useCapture);

19
gfx/layers/apz/test/mochitest/test_wheel_transactions.html
View File

@ -45,10 +45,6 @@ function scrollWheelOver(element, deltaY) {
synthesizeNativeWheelAndWaitForScrollEvent(element, 10, 10, 0, deltaY, driveTest);
}
function reportPositions(outer, inner) {
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] outer.scrollTop = " + outer.scrollTop + " and inner.scrollTop = " + inner.scrollTop + "\n");
}
function* runTest() {
var outer = document.getElementById('outer-frame');
var inner = document.getElementById('inner-frame');
@ -61,10 +57,8 @@ function* runTest() {
window.addEventListener("wheel", wheelTargetRecorder);
// Scroll |outer| to the bottom.
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] scrolling outer to the bottom\n");
while (outer.scrollTop < outer.scrollTopMax) {
yield scrollWheelOver(outer, -10);
reportPositions(outer, inner);
}
// Verify that this has brought |inner| under the wheel.
@ -72,9 +66,7 @@ function* runTest() {
window.removeEventListener("wheel", wheelTargetRecorder);
// Immediately after, scroll it back up a bit.
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] scroll outer back up a bit\n");
yield scrollWheelOver(outer, 10);
reportPositions(outer, inner);
// Check that it was |outer| that scrolled back, and |inner| didn't
// scroll at all, as all the above scrolls should be in the same
@ -91,27 +83,21 @@ function* runTest() {
// Scroll up a bit more. It's still |outer| scrolling because
// |inner| is still scrolled all the way to the top.
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] scrolling up\n");
yield scrollWheelOver(outer, 10);
reportPositions(outer, inner);
// Wait for the transaction timeout to elapse.
// timeout * 5 is used to make it less likely that the timeout is less than
// the system timestamp resolution
dump("[WHEEL_TRANS_LOG] waiting for timeout\n");
yield window.setTimeout(driveTest, timeout * 5);
// Now scroll down. The transaction having timed out, the event
// should pick up a new target, and that should be |inner|.
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] scrolling down after waiting for timeout\n");
yield scrollWheelOver(outer, -10);
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] checking if inner has scrolled\n");
ok(inner.scrollTop > 0, "'inner' should have been scrolled");
// Finally, test scroll handoff after a timeout.
// Continue scrolling |inner| down to the bottom.
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] scrolling inner to the bottom\n");
var prevScrollTop = inner.scrollTop;
while (inner.scrollTop < inner.scrollTopMax) {
yield scrollWheelOver(outer, -10);
@ -126,7 +112,6 @@ function* runTest() {
yield window.setTimeout(driveTest, timeout * 5);
// Continued downward scrolling should scroll |outer| to the bottom.
dump("[WHEEL_TRANS_LOG] [" + Date.now() + "] scrolling outer to the bottom\n");
prevScrollTop = outer.scrollTop;
while (outer.scrollTop < outer.scrollTopMax) {
yield scrollWheelOver(outer, -10);
@ -155,9 +140,7 @@ function startTest() {
// Disable smooth scrolling because it makes the test flaky (we don't have a good
// way of detecting when the scrolling is finished).
SpecialPowers.pushPrefEnv({"set": [["general.smoothScroll", false],
["layers.dump", true],
["apz.printtree", true]]},
SpecialPowers.pushPrefEnv({"set": [["general.smoothScroll", false]]},
function() {
SimpleTest.waitForFocus(startTest, window);
});