Bug 1116806: Enable dom.ipc.plugins.asyncInit on non-nightly channels by default; r=vladan
authorAaron Klotz <aklotz@mozilla.com>
Sun, 08 Feb 2015 15:57:23 -0700
changeset 264891 28dca8aee5844b99d18954af858fdbdeb6e2bfc3
parent 264890 1b374964865c550409812bc72d3aa3804ce599ca
child 264892 de296010ea9e40dff400d9c2a925d288aaf0e44c
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvladan
bugs1116806
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1116806: Enable dom.ipc.plugins.asyncInit on non-nightly channels by default; r=vladan
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2420,17 +2420,23 @@ pref("dom.ipc.plugins.flash.disable-prot
 
 pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", true);
 pref("dom.ipc.plugins.reportCrashURL", true);
 
 // How long we wait before unloading an idle plugin process.
 // Defaults to 30 seconds.
 pref("dom.ipc.plugins.unloadTimeoutSecs", 30);
 
+// Asynchronous plugin initialization should only be enabled on non-e10s
+// channels until some remaining bugs are resolved.
+#ifdef NIGHTLY_BUILD
 pref("dom.ipc.plugins.asyncInit", false);
+#else
+pref("dom.ipc.plugins.asyncInit", true);
+#endif
 
 pref("dom.ipc.processCount", 1);
 
 // Enable caching of Moz2D Path objects for SVG geometry elements
 pref("svg.path-caching.enabled", true);
 
 // Enable the use of display-lists for SVG hit-testing and painting.
 pref("svg.display-lists.hit-testing.enabled", true);