Backed out changeset 028f5d36f9cc (bug 823559 relanding). a=breakage
authorGeorg Fritzsche <georg.fritzsche@googlemail.com>
Wed, 20 Feb 2013 11:53:35 +0100
changeset 127553 66ffb2e23ffe18761021061e21b56d8c5d4e725c
parent 127552 99c93cc917500cfab96b44c8a98952b7b3bb072f
child 127558 07a8701aa96a5b6b66ae69680eaf0e6841e2957f
push id2154
push usergeorg.fritzsche@googlemail.com
push dateWed, 20 Feb 2013 10:54:39 +0000
treeherdermozilla-beta@66ffb2e23ffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbreakage
bugs823559
milestone20.0
backs out028f5d36f9ccdca25a2af5e52912a7d801aff796
Backed out changeset 028f5d36f9cc (bug 823559 relanding). a=breakage
modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1772,21 +1772,19 @@ pref("dom.ipc.plugins.timeoutSecs", 0);
 pref("dom.ipc.plugins.processLaunchTimeoutSecs", 0);
 pref("dom.ipc.plugins.parentTimeoutSecs", 0);
 #ifdef XP_WIN
 pref("dom.ipc.plugins.hangUITimeoutSecs", 0);
 pref("dom.ipc.plugins.hangUIMinDisplaySecs", 0);
 #endif
 #endif
 
-#ifdef XP_WIN
-// Disable oopp for java on windows. They run their own
-// process isolation which conflicts with our implementation.
+// Disable oopp for standard java. They run their own process isolation (which
+// conflicts with our implementation, at least on Windows).
 pref("dom.ipc.plugins.java.enabled", false);
-#endif
 
 pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", true);
 
 pref("dom.ipc.processCount", 1);
 
 pref("svg.smil.enabled", true);
 
 // Enable the use of display-lists for SVG hit-testing and painting.