Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 873727 - Use a listener instead of timers to fix intermittent failures. r=roc

Browse Source
This commit is contained in:
JosiahOne 2013-06-19 13:20:38 -04:00
parent 7a339f0b0b
commit a64eba0ec3
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
toolkit/content/tests/chrome/test_showcaret.xul
View File

@ -28,6 +28,21 @@ function runTest()
var sel1 = frames[0].getSelection();
sel1.collapse(frames[0].document.body, 0);
var sel2 = frames[1].getSelection();
sel2.collapse(frames[1].document.body, 0);
window.frames[0].focus();
document.commandDispatcher.getControllerForCommand("cmd_moveBottom").doCommand("cmd_moveBottom");
var listener = function() {
if (!(frames[0].scrollY > 0)) {
window.content.removeEventListener("scroll", listener, false);
}
}
window.frames[0].addEventListener("scroll", listener, false);
var sel1 = frames[0].getSelection();
sel1.collapse(frames[0].document.body, 0);
var sel2 = frames[1].getSelection();
sel2.collapse(frames[1].document.body, 0);
@ -47,22 +62,6 @@ function runTest()
otherWindow = window.open("window_showcaret.xul", "_blank", "chrome,width=400,height=200");
otherWindow.addEventListener("focus", otherWindowFocused, false);
var sel1 = frames[0].getSelection();
sel1.collapse(frames[0].document.body, 0);
var sel2 = frames[1].getSelection();
sel2.collapse(frames[1].document.body, 0);
window.frames[0].focus();
document.commandDispatcher.getControllerForCommand("cmd_moveBottom").doCommand("cmd_moveBottom");
/* We aren't sure exactly how long the cmd_moveBottom will take.
* Therefore, check for success every second. If we don't have success within 10 seconds, assume the scroll
* will never pass the test and fail it.
*/
var timeoutUntilFail = window.setTimeout(scrollYTimeout, 10000);
var testScroll = self.setInterval(function(){continueTest()}, 10);
}
function otherWindowFocused()
@ -87,19 +86,6 @@ function otherWindowFocused()
SimpleTest.finish();
}
function continueTest() {
if (frames[0].scrollY > 0) {
return;
}
testScroll = window.clearInterval(testScroll);
window.clearTimeout(timeoutUntilFail);
return;
}
function scrollYTimeout() {
ok(frames[0].scrollY > 0, "scrollY for non-showcaret");
}
]]>
</script>