Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bump rust-mozjs for the safe Runtime::new (fixes #11512)

Browse source
This commit is contained in:
Anthony Ramine 2016-05-31 01:13:59 +02:00
parent 3eb9403b4d
commit 88f8a22269
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -240,7 +240,7 @@ impl DedicatedWorkerGlobalScope {
}
};
let runtime = unsafe { new_rt_and_cx(parent_rt.rt()) };
let runtime = unsafe { new_rt_and_cx() };
*worker_rt_for_mainthread.lock().unwrap() = Some(SharedRt::new(&runtime));
let (devtools_mpsc_chan, devtools_mpsc_port) = channel();

4
components/script/script_runtime.rs
View file

@ -95,9 +95,9 @@ impl<'a> Drop for StackRootTLS<'a> {
}
#[allow(unsafe_code)]
pub unsafe fn new_rt_and_cx(parent_rt: *mut JSRuntime) -> Runtime {
pub unsafe fn new_rt_and_cx() -> Runtime {
LiveDOMReferences::initialize();
let runtime = Runtime::new(parent_rt);
let runtime = Runtime::new();
JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_rust_roots), ptr::null_mut());
JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_refcounted_objects), ptr::null_mut());

2
components/script/script_thread.rs
View file

@ -521,7 +521,7 @@ impl ScriptThread {
port: Receiver<MainThreadScriptMsg>,
chan: Sender<MainThreadScriptMsg>)
-> ScriptThread {
let runtime = unsafe { new_rt_and_cx(ptr::null_mut()) };
let runtime = unsafe { new_rt_and_cx() };
unsafe {
JS_SetWrapObjectCallbacks(runtime.rt(),