Bug 947755, try to avoid use of setTimeout when there is an event to use, r=khuey

This commit is contained in:
Olli Pettay 2016-02-13 03:40:01 +02:00
parent 7c92933074
commit 9b0e1b6a77
2 changed files with 10 additions and 1 deletions

View File

@ -6,7 +6,6 @@
document.write("<h5 id='dynamic'>document.written content</h5>");
document.close();
window.history.go(-1);
opener.setTimeout("isTestDynamic()", 2500);
}
function start() {
@ -14,6 +13,15 @@
setTimeout(run, 0);
}
}
window.addEventListener("pageshow",
function() {
++opener.file_document_write_1_loadCount;
if (opener.file_document_write_1_loadCount == 2) {
opener.setTimeout("isTestDynamic()", 0);
}
opener.ok(opener.file_document_write_1_loadCount <= 2);
});
</script>
</head>
<body onload="start();">

View File

@ -49,6 +49,7 @@ function nextTest_() {
}
// Needed by file_document_write_1.html
window.file_document_write_1_loadCount = 0;
function isTestDynamic() {
var dyn = testWindow.document.getElementById("dynamic");
is(dyn, null, "Should have gone back to the static page!");