diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 4ff72e620a6d..5ebdff0e6440 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -933,12 +933,14 @@ pref("toolbar.customization.usesheet", false); // The default for this pref reflects whether the build is capable of IPC. // (Turning it on in a no-IPC build will have no effect.) #ifdef XP_MACOSX -// i386 ipc preferences -pref("dom.ipc.plugins.enabled.i386", false); -pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true); -pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true); -// x86_64 ipc preferences -pref("dom.ipc.plugins.enabled.x86_64", true); +// OSX still has only partial support for IPC. Note that the PowerPC +// and x86 builds must generate identical copies of this file, so we +// can't make the prefs indicate that IPC is not available at all in +// PowerPC builds. +pref("dom.ipc.plugins.enabled", false); +// These plug-ins will run OOP by default +pref("dom.ipc.plugins.enabled.flash player.plugin", true); +pref("dom.ipc.plugins.enabled.javaplugin2_npapi.plugin", true); #elifdef MOZ_IPC pref("dom.ipc.plugins.enabled", true); #else diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js index c39c05dcdc80..b6dfcab784d8 100644 --- a/layout/tools/reftest/reftest.js +++ b/layout/tools/reftest/reftest.js @@ -441,30 +441,6 @@ function BuildConditionSandbox(aURL) { getBoolPref: function(p) { return this._prefs.getBoolPref(p); }, getIntPref: function(p) { return this._prefs.getIntPref(p); } } - - sandbox.areOOPPenabled = function () { - netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); - var prefservice = Components.classes["@mozilla.org/preferences-service;1"] - .getService(CI.nsIPrefBranch); - - var pref = false; - - if (navigator.platform.indexOf("Mac") == 0) { - var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"] - .getService(CI.nsIXULAppInfo) - .QueryInterface(CI.nsIXULRuntime); - if (xulRuntime.XPCOMABI.match(/x86-/)) { - pref = prefservice.getBoolPref("dom.ipc.plugins.enabled.i386"); - } - else if (xulRuntime.XPCOMABI.match(/x86_64-/)) { - pref = prefservice.getBoolPref("dom.ipc.plugins.enabled.x86_64"); - } - } - else { - pref = prefservice.getBoolPref("dom.ipc.plugins.enabled"); - } - return pref; - }; dump("REFTEST INFO | Dumping JSON representation of sandbox \n"); dump("REFTEST INFO | " + JSON.stringify(sandbox) + " \n"); diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp index e181db3f89a3..b907fe981c7b 100644 --- a/modules/plugin/base/src/nsNPAPIPlugin.cpp +++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp @@ -373,17 +373,7 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag) prefFile.Cut(0, slashPos + 1); ToLowerCase(prefFile); -#ifdef XP_MACOSX -#if defined(__i386__) - nsCAutoString prefGroupKey("dom.ipc.plugins.enabled.i386."); -#elif defined(__x86_64__) - nsCAutoString prefGroupKey("dom.ipc.plugins.enabled.x86_64."); -#elif defined(__ppc__) - nsCAutoString prefGroupKey("dom.ipc.plugins.enabled.ppc."); -#endif -#else nsCAutoString prefGroupKey("dom.ipc.plugins.enabled."); -#endif PRUint32 prefCount; char** prefNames; @@ -423,17 +413,7 @@ nsNPAPIPlugin::RunPluginOOP(const nsPluginTag *aPluginTag) if (!prefSet) { oopPluginsEnabled = PR_FALSE; -#ifdef XP_MACOSX -#if defined(__i386__) - prefs->GetBoolPref("dom.ipc.plugins.enabled.i386", &oopPluginsEnabled); -#elif defined(__x86_64__) - prefs->GetBoolPref("dom.ipc.plugins.enabled.x86_64", &oopPluginsEnabled); -#elif defined(__ppc__) - prefs->GetBoolPref("dom.ipc.plugins.enabled.ppc", &oopPluginsEnabled); -#endif -#else prefs->GetBoolPref("dom.ipc.plugins.enabled", &oopPluginsEnabled); -#endif } return oopPluginsEnabled; diff --git a/modules/plugin/test/mochitest/test_GCrace.html b/modules/plugin/test/mochitest/test_GCrace.html index 2907877c92b9..dd16bcb7faa8 100644 --- a/modules/plugin/test/mochitest/test_GCrace.html +++ b/modules/plugin/test/mochitest/test_GCrace.html @@ -16,7 +16,10 @@ SimpleTest.waitForExplicitFinish(); function start() { - if (!SimpleTest.areOOPPenabled()) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; diff --git a/modules/plugin/test/mochitest/test_crash_nested_loop.html b/modules/plugin/test/mochitest/test_crash_nested_loop.html index 38cd8cf6fc62..d9c60dea0ba5 100644 --- a/modules/plugin/test/mochitest/test_crash_nested_loop.html +++ b/modules/plugin/test/mochitest/test_crash_nested_loop.html @@ -12,7 +12,10 @@ var iframe = document.getElementById('iframe1'); window.frameLoaded = function frameLoaded_toCrash() { - if (!SimpleTest.areOOPPenabled()) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; diff --git a/modules/plugin/test/mochitest/test_crash_notify.xul b/modules/plugin/test/mochitest/test_crash_notify.xul index 259af9de95aa..48b09c831275 100644 --- a/modules/plugin/test/mochitest/test_crash_notify.xul +++ b/modules/plugin/test/mochitest/test_crash_notify.xul @@ -92,7 +92,10 @@ function onPluginCrashed(aEvent) { } function runTests() { - if (!SimpleTest.areOOPPenabled()) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; diff --git a/modules/plugin/test/mochitest/test_crash_notify_no_report.xul b/modules/plugin/test/mochitest/test_crash_notify_no_report.xul index 6d55071156ff..896249c18f52 100644 --- a/modules/plugin/test/mochitest/test_crash_notify_no_report.xul +++ b/modules/plugin/test/mochitest/test_crash_notify_no_report.xul @@ -94,7 +94,10 @@ function onPluginCrashed(aEvent) { } function runTests() { - if (!SimpleTest.areOOPPenabled()) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; diff --git a/modules/plugin/test/mochitest/test_crash_submit.xul b/modules/plugin/test/mochitest/test_crash_submit.xul index ca9a848b90ce..67ac520b7787 100644 --- a/modules/plugin/test/mochitest/test_crash_submit.xul +++ b/modules/plugin/test/mochitest/test_crash_submit.xul @@ -93,7 +93,9 @@ function onPluginCrashed(aEvent) { } function runTests() { - if (!SimpleTest.areOOPPenabled()) { + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; diff --git a/modules/plugin/test/mochitest/test_crashing.html b/modules/plugin/test/mochitest/test_crashing.html index f2c666eedcfc..d678ff00e16c 100644 --- a/modules/plugin/test/mochitest/test_crashing.html +++ b/modules/plugin/test/mochitest/test_crashing.html @@ -12,7 +12,10 @@ var iframe = document.getElementById('iframe1'); window.frameLoaded = function frameLoaded_toCrash() { - if (!SimpleTest.areOOPPenabled()) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; diff --git a/modules/plugin/test/mochitest/test_crashing2.html b/modules/plugin/test/mochitest/test_crashing2.html index fde29f4f318b..d2a2db79c343 100644 --- a/modules/plugin/test/mochitest/test_crashing2.html +++ b/modules/plugin/test/mochitest/test_crashing2.html @@ -12,7 +12,10 @@ var iframe = document.getElementById('iframe1'); function mainLoaded() { - if (!SimpleTest.areOOPPenabled()) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; diff --git a/modules/plugin/test/mochitest/test_hanging.html b/modules/plugin/test/mochitest/test_hanging.html index 4dbae3f0f76d..2a2b4e304056 100644 --- a/modules/plugin/test/mochitest/test_hanging.html +++ b/modules/plugin/test/mochitest/test_hanging.html @@ -12,16 +12,15 @@ var iframe = document.getElementById('iframe1'); window.frameLoaded = function frameLoaded_toCrash() { - if (!SimpleTest.areOOPPenabled()) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + var prefs = Components.classes['@mozilla.org/preferences-service;1'] + .getService(Components.interfaces.nsIPrefBranch); + if (!prefs.getBoolPref('dom.ipc.plugins.enabled')) { ok(true, "Skipping this test when IPC plugins are not enabled."); SimpleTest.finish(); return; } - netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); - var prefs = Components.classes['@mozilla.org/preferences-service;1'] - .getService(Components.interfaces.nsIPrefBranch); - // the default timeout is annoying high for mochitest runs var timeoutPref = "dom.ipc.plugins.timeoutSecs"; prefs.setIntPref(timeoutPref, 5); diff --git a/modules/plugin/test/reftest/reftest.list b/modules/plugin/test/reftest/reftest.list index a1c05f7576af..81274e0511ed 100644 --- a/modules/plugin/test/reftest/reftest.list +++ b/modules/plugin/test/reftest/reftest.list @@ -6,7 +6,7 @@ fails-if(!haveTestPlugin) == plugin-alpha-opacity.html div-alpha-opacity.html fails-if(!haveTestPlugin) == windowless-clipping-1.html windowless-clipping-1-ref.html fails-if(!haveTestPlugin) == border-padding-1.html border-padding-1-ref.html fails-if(!haveTestPlugin) == border-padding-2.html border-padding-2-ref.html -asserts-if(http.oscpu.match(/Linux/),0-1) random-if(d2d) fails-if(!haveTestPlugin) skip-if(!areOOPPenabled()) == pluginproblemui-direction-1.html pluginproblemui-direction-1-ref.html # assertion is bug 585394 -asserts-if(http.oscpu.match(/Linux/),0-1) fails-if(!haveTestPlugin) skip-if(!areOOPPenabled()) == pluginproblemui-direction-2.html pluginproblemui-direction-2-ref.html # assertion is bug 585394 +asserts-if(http.oscpu.match(/Linux/),0-1) random-if(d2d) fails-if(!haveTestPlugin) skip-if(!prefs.getBoolPref("dom.ipc.plugins.enabled")) == pluginproblemui-direction-1.html pluginproblemui-direction-1-ref.html # assertion is bug 585394 +asserts-if(http.oscpu.match(/Linux/),0-1) fails-if(!haveTestPlugin) skip-if(!prefs.getBoolPref("dom.ipc.plugins.enabled")) == pluginproblemui-direction-2.html pluginproblemui-direction-2-ref.html # assertion is bug 585394 # Disabled for now to investigate Windows/Linux test failures # fails-if(!haveTestPlugin) == border-padding-3.html border-padding-3-ref.html diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js index 0bb953df3932..fa05fb0e53fb 100644 --- a/testing/mochitest/tests/SimpleTest/SimpleTest.js +++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js @@ -32,33 +32,6 @@ if (parentRunner) { ipcMode = parentRunner.ipcMode; } -/** - * Check for OOPP preferences -**/ -SimpleTest.areOOPPenabled = function () { - netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); - var prefservice = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - - var pref = false; - - if (navigator.platform.indexOf("Mac") == 0) { - var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"] - .getService(Components.interfaces.nsIXULAppInfo) - .QueryInterface(Components.interfaces.nsIXULRuntime); - if (xulRuntime.XPCOMABI.match(/x86-/)) { - pref = prefservice.getBoolPref("dom.ipc.plugins.enabled.i386"); - } - else if (xulRuntime.XPCOMABI.match(/x86_64-/)) { - pref = prefservice.getBoolPref("dom.ipc.plugins.enabled.x86_64"); - } - } - else { - pref = prefservice.getBoolPref("dom.ipc.plugins.enabled"); - } - return pref; -}; - // Check to see if the TestRunner is present and has logging if (parentRunner) { SimpleTest._logEnabled = parentRunner.logEnabled; diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index a9c951bc43ec..28fc48d8b924 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -83,17 +83,7 @@ mochitest-a11y: $(CHECK_TEST_ERROR) mochitest-ipcplugins: -#ifdef XP_MACOSX -#if defined(__i386__) - $(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.i386=true --test-path=modules/plugin/test -#elif defined(__x86_64__) - $(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.x86_64=true --test-path=modules/plugin/test -#elif defined(__ppc__) - $(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled.ppc=true --test-path=modules/plugin/test -#endif -#else $(RUN_MOCHITEST) --setpref=dom.ipc.plugins.enabled=true --test-path=modules/plugin/test -#endif $(CHECK_TEST_ERROR) # Usage: |make [EXTRA_TEST_ARGS=...] *test|.