mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-06 06:22:33 +00:00
Backed out changeset f2cade11e3c0 (bug 926830) for mochitest memory leak on a CLOSED TREE
This commit is contained in:
parent
b44e227c4e
commit
7bb450e8c7
@ -1,7 +1,5 @@
|
||||
[DEFAULT]
|
||||
support-files =
|
||||
empty_window.xul
|
||||
utils.js
|
||||
support-files = empty_window.xul
|
||||
|
||||
[test_bug343416.xul]
|
||||
[test_bug429954.xul]
|
||||
|
@ -1,6 +1,3 @@
|
||||
[DEFAULT]
|
||||
support-files = utils.js
|
||||
|
||||
[test_assign_event_data.html]
|
||||
skip-if = toolkit == "cocoa" # Bug 933303
|
||||
[test_bug565392.html]
|
||||
|
@ -8,13 +8,19 @@
|
||||
src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
|
||||
<script type="text/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/NativeKeyCodes.js"></script>
|
||||
<script type="text/javascript" src="utils.js"></script>
|
||||
<link rel="stylesheet" type="text/css"
|
||||
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
<script type="application/javascript">
|
||||
setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
|
||||
var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
|
||||
.getService(SpecialPowers.Ci.nsIPluginHost);
|
||||
var pluginTags = pluginHost.getPluginTags();
|
||||
for (var tag of pluginTags) {
|
||||
if (tag.name == "Test Plug-in") {
|
||||
tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<p id="display">
|
||||
|
@ -3,13 +3,19 @@
|
||||
<title>Test for plugin child widgets not being messed up by scrolling</title>
|
||||
<script type="text/javascript"
|
||||
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="text/javascript" src="utils.js"></script>
|
||||
<link rel="stylesheet" type="text/css"
|
||||
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body onload="setTimeout(runTests, 0)">
|
||||
<script type="application/javascript">
|
||||
setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
|
||||
var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
|
||||
.getService(SpecialPowers.Ci.nsIPluginHost);
|
||||
var pluginTags = pluginHost.getPluginTags();
|
||||
for (var tag of pluginTags) {
|
||||
if (tag.name == "Test Plug-in") {
|
||||
tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<p id="display">
|
||||
|
@ -3,12 +3,18 @@
|
||||
<head>
|
||||
<title>Test for plugin child widgets not being invalidated by scrolling</title>
|
||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="text/javascript" src="utils.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
</head>
|
||||
<body onload="initialize()">
|
||||
<script type="application/javascript">
|
||||
setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
|
||||
var pluginHost = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
|
||||
.getService(SpecialPowers.Ci.nsIPluginHost);
|
||||
var pluginTags = pluginHost.getPluginTags();
|
||||
for (var tag of pluginTags) {
|
||||
if (tag.name == "Test Plug-in") {
|
||||
tag.enabledState = SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED;;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<p id="display">
|
||||
|
@ -1,27 +0,0 @@
|
||||
|
||||
function getTestPlugin(pluginName) {
|
||||
var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
|
||||
.getService(SpecialPowers.Ci.nsIPluginHost);
|
||||
var tags = ph.getPluginTags();
|
||||
var name = pluginName || "Test Plug-in";
|
||||
for (var tag of tags) {
|
||||
if (tag.name == name) {
|
||||
return tag;
|
||||
}
|
||||
}
|
||||
|
||||
ok(false, "Could not find plugin tag with plugin name '" + name + "'");
|
||||
return null;
|
||||
}
|
||||
|
||||
// call this to set the test plugin(s) initially expected enabled state.
|
||||
// it will automatically be reset to it's previous value after the test
|
||||
// ends
|
||||
function setTestPluginEnabledState(newEnabledState, pluginName) {
|
||||
var plugin = getTestPlugin(pluginName);
|
||||
var oldEnabledState = plugin.enabledState;
|
||||
plugin.enabledState = newEnabledState;
|
||||
SimpleTest.registerCleanupFunction(function() {
|
||||
getTestPlugin(pluginName).enabledState = oldEnabledState;
|
||||
});
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user