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

Merge m-c to inbound

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-05-07 20:29:19 -04:00
commit dbbb10d4f3
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/plugins/test/mochitest/test_crash_submit.xul
View File

@ -93,12 +93,6 @@ function onPluginCrashed(aEvent) {
}
function runTests() {
if (navigator.userAgent.match(/ SeaMonkey\//)) {
todo(false, "Skipping this test on Seamonkey ftb. (Bug 604129)");
SimpleTest.finish();
return;
}
if (!SimpleTest.testPluginIsOOP()) {
todo(false, "Skipping this test when test plugin is not OOP.");
SimpleTest.finish();
@ -130,4 +124,3 @@ function runTests() {
]]>
</script>
</window>

2
js/src/jsscript.cpp
View File

@ -981,7 +981,7 @@ js::SaveScriptFilename(JSContext *cx, const char *filename)
* scripts or exceptions pointing to the filename may no longer be
* reachable.
*/
if (cx->compartment->needsBarrier() && rt->gcIsFull)
if (rt->gcIncrementalState == MARK && rt->gcIsFull)
sfe->marked = true;
#endif

2
xpcom/tests/unit/xpcshell.ini
View File

@ -44,7 +44,7 @@ fail-if = os == "android"
fail-if = os == "android"
[test_versioncomparator.js]
[test_comp_no_aslr.js]
fail-if = os != "win"
skip-if = os != "win"
[test_windows_shortcut.js]
[test_bug745466.js]
skip-if = os == "win"