Bug 1374492 - Don't let extensions disable e10s in DevEdition. r=Felipe, a=jcristau
authorBlake Kaplan <mrbkap@gmail.com>
Wed, 21 Jun 2017 10:57:52 -0700
changeset 414102 5754e0bd12f5c7df91d32d398a659367f38ef0c9
parent 414101 3ac23bd293016dc152f0956e1bb64072193ee8e3
child 414103 c1683cb4df4583171c88b00e3a26e035959e5b1f
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFelipe, jcristau
bugs1374492
milestone55.0
Bug 1374492 - Don't let extensions disable e10s in DevEdition. r=Felipe, a=jcristau MozReview-Commit-ID: DBRl8Sx8QQ3
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1547,17 +1547,17 @@ pref("extensions.interposition.enabled",
 pref("extensions.interposition.prefetching", true);
 
 // But don't allow non-MPC extensions by default on Nightly
 #if defined(NIGHTLY_BUILD)
 pref("extensions.allow-non-mpc-extensions", false);
 #endif
 
 // Enable blocking of e10s and e10s-multi for add-on users on beta/release.
-#ifdef RELEASE_OR_BETA
+#if defined(RELEASE_OR_BETA) && !defined(MOZ_DEV_EDITION)
 pref("extensions.e10sBlocksEnabling", true);
 pref("extensions.e10sMultiBlocksEnabling", true);
 #endif
 
 // How often to check for CPOW timeouts. CPOWs are only timed out by
 // the hang monitor.
 pref("dom.ipc.cpow.timeout", 500);