Bug 1031608 - Enable CompartmentPerAddon when e10s is enabled at startup (r=bholley)
authorBill McCloskey <wmccloskey@mozilla.com>
Wed, 02 Jul 2014 13:23:04 -0700
changeset 191938 f07db8ccaa2ff79fe9bc3255cd930762201ac882
parent 191937 4e35172b6476f5378f45b3329353c9f9aa06615f
child 191939 336df7501b0725c19f318ae01e57e82d40929da9
push id45705
push userwmccloskey@mozilla.com
push dateWed, 02 Jul 2014 20:23:20 +0000
treeherdermozilla-inbound@f07db8ccaa2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1031608
milestone33.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 1031608 - Enable CompartmentPerAddon when e10s is enabled at startup (r=bholley)
js/xpconnect/src/XPCWrappedNativeScope.cpp
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -188,17 +188,18 @@ XPCWrappedNativeScope::AttachComponentsO
 
 static bool
 CompartmentPerAddon()
 {
     static bool initialized = false;
     static bool pref = false;
 
     if (!initialized) {
-        pref = Preferences::GetBool("dom.compartment_per_addon", false);
+        pref = Preferences::GetBool("dom.compartment_per_addon", false) ||
+               Preferences::GetBool("browser.tabs.remote.autostart", false);
         initialized = true;
     }
 
     return pref;
 }
 
 JSObject*
 XPCWrappedNativeScope::EnsureContentXBLScope(JSContext *cx)