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 889614 - Fix and cleanup plugin re-parenting tests to catch this in the future. r=josh

Browse Source
This commit is contained in:
John Schoenick 2013-07-22 15:08:47 -07:00
parent c97b82a961
commit c49e871f9d
3 changed files with 45 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/plugins/test/mochitest/Makefile.in
View File

@ -114,7 +114,6 @@ MOCHITEST_CHROME_FILES = \
ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
MOCHITEST_FILES += \
test_instance_re-parent-windowed.html \
test_visibility.html \
$(NULL)

59
dom/plugins/test/mochitest/test_instance_re-parent-windowed.html
View File

@ -1,59 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>Test re-parentinging an instance's DOM node</title>
<script type="text/javascript" src="/MochiKit/packed.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="startTest()">
<p id="display"></p>
<div id="div1">
<embed id="plugin1" type="application/x-test" width="200" height="200" wmode="window"></embed>
</div>
<div id="div2">
</div>
<script type="application/javascript;version=1.8">
SimpleTest.waitForExplicitFinish();
var destroyed = false;
function onDestroy() {
destroyed = true;
}
function startTest() {
var exceptionThrown = false;
var p = document.getElementById('plugin1');
var d1 = document.getElementById('div1');
var d2 = document.getElementById('div2');
p.startWatchingInstanceCount();
p.callOnDestroy(onDestroy);
try {
d1.removeChild(p);
} catch (e) {
exceptionThrown = true;
}
is(exceptionThrown, false, "Testing for exception after removeChild.");
try {
d2.appendChild(p);
} catch (e) {
exceptionThrown = true;
}
is(exceptionThrown, false, "Testing for exception after appendChild.");
is(destroyed, false, "No instances should have been destroyed at this point.");
is(p.getInstanceCount(), 0, "No new instances should have been created at this point.");
p.stopWatchingInstanceCount();
SimpleTest.finish();
}
</script>
</body>
</html>

76
dom/plugins/test/mochitest/test_instance_re-parent.html
View File

@ -6,7 +6,7 @@
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="runTests()">
<body onload="begin()">
<p id="display"></p>
<div id="div1">
@ -28,37 +28,32 @@
var d2 = document.getElementById('div2');
var destroyed = false;
function onDestroy() {
destroyed = true;
function begin() {
runTests(function() {
// Callback when finished - set plugin to windowed and repeat the tests
info("Repeating tests with wmode=window");
p.setAttribute("wmode", "window");
d1.appendChild(p);
// Forces the plugin to be respawned
p.src = p.src;
destroyed = false;
exceptionThrown = false;
runTests(function () {
SimpleTest.finish();
});
});
}
function testsFinished() {
p.stopWatchingInstanceCount();
SimpleTest.finish();
}
function continueTests2() {
try {
is(p.getInstanceCount(), 1, "One new instance should have been created at this point.");
} catch (e) {
exceptionThrown = true;
}
is(exceptionThrown, false, "Testing for exception getting instance count from plugin.");
testsFinished();
}
function continueTests1() {
// Adding to the document will kick off the plugin load. Need to have a timeout
// before we can safely call into it.
d2.appendChild(p);
setTimeout('continueTests2();', 0);
}
function runTests() {
function runTests(callback) {
// First tests involve moving the instance from one div to another.
p.startWatchingInstanceCount();
p.callOnDestroy(onDestroy);
p.callOnDestroy(function() {
destroyed = true;
});
try {
d1.removeChild(p);
@ -77,9 +72,28 @@
is(destroyed, false, "No instances should have been destroyed at this point.");
is(p.getInstanceCount(), 0, "No new instances should have been created at this point.");
// Now remove the instance from the document and let it die.
d2.removeChild(p);
setTimeout('continueTests1();', 0);
// Wait for the event loop to spin and ensure the plugin still wasn't touched
SimpleTest.executeSoon(function() {
is(destroyed, false, "No instances should have been destroyed at this point.");
is(p.getInstanceCount(), 0, "No new instances should have been created at this point.");
// Removing the instance for a full event loop *should* respawn
d2.removeChild(p);
SimpleTest.executeSoon(function() {
d2.appendChild(p);
SimpleTest.executeSoon(function() {
try {
is(p.getInstanceCount(), 1, "One new instance should have been created at this point.");
} catch (e) {
exceptionThrown = true;
}
is(exceptionThrown, false, "Testing for exception getting instance count from plugin.");
p.stopWatchingInstanceCount();
callback.apply(null);
});
});
});
}
</script>
</body>