wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 856595 - Fix intermittent failure in test_wheel_default_action.html. r=mikedeboer

Browse Source
This commit is contained in:
Drew Willcoxon 2014-01-30 09:20:37 -08:00
parent 6a24be8ae0
commit 1135f0e3c4
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/base/content/browser-fullZoom.js
View File

@ -310,6 +310,11 @@ var FullZoom = {
if (token.isCurrent) {
ZoomManager.setZoomForBrowser(browser, value === undefined ? 1 : value);
this._ignorePendingZoomAccesses(browser);
this._executeSoon(function () {
// _getGlobalValue may be either sync or async, so notify asyncly so
// observers are guaranteed consistent behavior.
Services.obs.notifyObservers(null, "browser-fullZoom:reset", "");
});
}
});
this._removePref(browser);

32
dom/events/test/window_wheel_default_action.html
View File

@ -78,6 +78,14 @@ function hitEventLoop(aFunc, aTimes)
}
}
function onZoomReset(aCallback) {
var topic = "browser-fullZoom:reset";
SpecialPowers.addObserver(function observe() {
SpecialPowers.removeObserver(observe, topic);
SimpleTest.executeSoon(aCallback);
}, topic, false);
}
function setDeltaMultiplierSettings(aSettings)
{
SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", aSettings.deltaMultiplierX * 100);
@ -1129,7 +1137,9 @@ function doTestZoom(aSettings, aCallback)
}
synthesizeKey("0", { accelKey: true });
hitEventLoop(doNextTest, 20);
onZoomReset(function () {
hitEventLoop(doNextTest, 20);
});
}, 20);
}
doNextTest();
@ -1137,10 +1147,15 @@ function doTestZoom(aSettings, aCallback)
function doTestZoomedScroll(aCallback)
{
function testZoomedPixelScroll()
function prepareTestZoomedPixelScroll()
{
// Reset zoom and store the scroll amount into the data.
synthesizeKey("0", { accelKey: true });
onZoomReset(testZoomedPixelScroll);
}
function testZoomedPixelScroll()
{
gScrollableElement.scrollTop = 1000;
gScrollableElement.scrollLeft = 1000;
// Ensure not to be in reflow.
@ -1190,17 +1205,21 @@ function doTestZoomedScroll(aCallback)
window.removeEventListener("MozMousePixelScroll", handler, true);
synthesizeKey("0", { accelKey: true });
testZoomedLineScroll();
onZoomReset(prepareTestZoomedLineScroll);
}, 20);
}, 20);
}, 20);
}, 20);
}
function testZoomedLineScroll()
function prepareTestZoomedLineScroll()
{
// Reset zoom and store the scroll amount into the data.
synthesizeKey("0", { accelKey: true });
onZoomReset(testZoomedLineScroll);
}
function testZoomedLineScroll()
{
gScrollableElement.scrollTop = 1000;
gScrollableElement.scrollLeft = 1000;
// Ensure not to be in reflow.
@ -1262,8 +1281,7 @@ function doTestZoomedScroll(aCallback)
window.removeEventListener("MozMousePixelScroll", handler, true);
synthesizeKey("0", { accelKey: true });
SimpleTest.executeSoon(aCallback);
onZoomReset(aCallback);
}, 20);
}, 20);
}, 20);
@ -1273,7 +1291,7 @@ function doTestZoomedScroll(aCallback)
// XXX It's too difficult to test page scroll because the page scroll amount
// is computed by complex logic.
testZoomedPixelScroll();
prepareTestZoomedPixelScroll();
}
function doTestWholeScroll(aCallback)