1 files changed, 11 insertions, 1 deletions
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs
index 35c0bdd618f..509a7e93e71 100644
--- a/components/script/script_runtime.rs
+++ b/components/script/script_runtime.rs
@@ -13,7 +13,7 @@ use js::glue::CollectServoSizes;
 use js::jsapi::{DisableIncrementalGC, GCDescription, GCProgress};
 use js::jsapi::{JSContext, JS_GetRuntime, JSRuntime, JSTracer, SetDOMCallbacks, SetGCSliceCallback};
 use js::jsapi::{JSGCInvocationKind, JSGCStatus, JS_AddExtraGCRootsTracer, JS_SetGCCallback};
-use js::jsapi::{JSObject, SetPreserveWrapperCallback};
+use js::jsapi::{JSObject, RuntimeOptionsRef, SetPreserveWrapperCallback};
 use js::rust::Runtime;
 use libc;
 use profile_traits::mem::{Report, ReportKind, ReportsChan};
@@ -24,6 +24,7 @@ use std::marker::PhantomData;
 use std::ptr;
 use time::{Tm, now};
 use util::opts;
+use util::prefs::get_pref;
 use util::thread_state;
 
 /// Common messages used to control the event loops in both the script and the worker
@@ -121,6 +122,15 @@ pub fn new_rt_and_cx() -> Runtime {
         DisableIncrementalGC(runtime.rt());
     }
 
+    // Enable or disable the JITs.
+    let rt_opts = unsafe { &mut *RuntimeOptionsRef(runtime.rt()) };
+    if let Some(val) = get_pref("js.baseline.enabled").as_boolean() {
+        rt_opts.set_baseline_(val);
+    }
+    if let Some(val) = get_pref("js.ion.enabled").as_boolean() {
+        rt_opts.set_ion_(val);
+    }
+
     runtime
 }