Backout c0f9a84ffb2d (bug 640889) because it has been pushed with the incorrect bug number.

This commit is contained in:
Mounir Lamouri 2011-05-17 15:43:59 +02:00
parent ca98ab7783
commit 47ddeb3dad

View File

@ -17,69 +17,46 @@
<![CDATA[
SimpleTest.waitForExplicitFinish();
// Bug 640889 - the test doesn't like seeing the WinXP resizer.
var version = Components.classes["@mozilla.org/system-info;1"]
.getService(Components.interfaces.nsIPropertyBag2)
.getProperty("version");
var winXP = navigator.platform.indexOf("Win") == 0 && parseFloat(version) < 6.0;
var tests = [{maximize:false}, {maximize:true}];
var testIndex = 0;
var win;
function testInfo() {
return tests[testIndex].maximize ? " (maximized)" : " (non-maximized)";
}
if (navigator.platform.indexOf("Win") == 0 && parseFloat(version) < 6.0) {
todo(false, "Bug 640889 - the test doesn't like seeing the WinXP resizer.");
SimpleTest.finish();
} else {
function doTest(evt) {
if (tests[testIndex].maximize) {
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator);
wm.getMostRecentWindow("navigator:browser").maximize();
}
var initialCount = win.mozPaintCount;
function nextStep() {
if (win.mozPaintCount == initialCount) {
is(win.mozPaintCount, initialCount, "Waiting for mozPaintCount to increase.");
// Do not use SimpleTest.executeSoon() here: give a little more time.
setTimeout(nextStep, 0);
return;
}
isnot(win.mozPaintCount, initialCount, "mozPaintCount has increased" + testInfo());
isnot(win.mozPaintCount, initialCount, "mozPaintCount has increased");
var utils = win.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIDOMWindowUtils);
ok(utils.leafLayersPartitionWindow(),
"Leaf layers should form a non-overlapping partition of the browser window" + testInfo());
"Leaf layers should form a non-overlapping partition of the browser window");
win.close();
++testIndex;
nextTest();
SimpleTest.finish();
}
SimpleTest.executeSoon(nextStep);
}
function nextTest() {
if (testIndex >= tests.length) {
SimpleTest.finish();
return;
}
// Skip non-maximized tests on WinXP since the resizer causes overlapping layers
if (winXP && !tests[testIndex].maximize) {
++testIndex;
nextTest();
return;
}
// Run the test in a separate window so we get a clean browser window.
win = window.open("data:text/html,<html style='overflow:scroll'>",
// Run the test in a separate window so we get a clean browser window.
var win = window.open("data:text/html,<html style='overflow:scroll'>",
"", "scrollbars=yes,toolbar,menubar,width=500,height=500");
win.addEventListener('load', doTest, false);
}
win.addEventListener('load', doTest, false);
nextTest();
}
]]>
</script>
</window>