Bug 1374492 - Don't let extensions disable e10s in DevEdition. r=Felipe draft
authorBlake Kaplan <mrbkap@gmail.com>
Wed, 21 Jun 2017 10:57:52 -0700
changeset 598406 d6b10a2ee11deb556673aded1f8ed7d58ecacc62
parent 598405 6779547fa0fca357851739ebee9bfd461675c7aa
child 634470 3473b26556540f8ac177a0308a707a6255ced76c
push id65196
push userbmo:mrbkap@mozilla.com
push dateWed, 21 Jun 2017 18:08:12 +0000
reviewersFelipe
bugs1374492
milestone56.0a1
Bug 1374492 - Don't let extensions disable e10s in DevEdition. r=Felipe MozReview-Commit-ID: DBRl8Sx8QQ3
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1556,17 +1556,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);