Bug 1061894 - Clean up correctly in ownerdiscard.html. r=seth

This commit is contained in:
Timothy Nikkel 2014-09-04 11:46:06 -07:00
parent 82b9747f19
commit 20834f1ce3

View File

@ -22,9 +22,7 @@
var img = document.getElementById('victim');
var observer = new ImageDecoderObserverStub();
observer.discard = function() {
SpecialPowers.clearUserPref('min_discard_timeout_ms');
imgLoadingContent.removeObserver(gObserver);
setTimeout("document.documentElement.className = '';", 0);
cleanupAndFinish();
}
observer = SpecialPowers.wrapCallbackObject(observer);
var gObserver = Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
@ -39,10 +37,16 @@
setTimeout(function() { document.adoptNode(tCF0); }, 0);
}
document.addEventListener("DOMContentLoaded", initCF, false);
function finish() {
setTimeout("document.documentElement.className = '';", 30000);
function cleanupAndFinish() {
SpecialPowers.clearUserPref('min_discard_timeout_ms');
imgLoadingContent.removeObserver(gObserver);
setTimeout("document.documentElement.className = '';", 0);
}
window.addEventListener("load", finish, false);
function loadhandler() {
setTimeout("cleanupAndFinish();", 30000);
}
window.addEventListener("load", loadhandler, false);
</script>
</body>
</html>