diff options
Diffstat (limited to 'src/components/script/script_task.rs')
-rw-r--r-- | src/components/script/script_task.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index d4215b46c28..d4561ebc21b 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -32,10 +32,9 @@ use layout_interface; use extra::url::Url; use geom::point::Point2D; use geom::size::Size2D; -use js::JSVAL_NULL; use js::global::DEBUG_FNS; -use js::glue::RUST_JSVAL_TO_OBJECT; use js::jsapi::{JSObject, JS_InhibitGC, JS_AllowGC, JS_CallFunctionValue}; +use js::jsval::NullValue; use js::rust::{Compartment, Cx, CxUtils, RtUtils}; use js; use servo_msg::compositor_msg::{FinishedLoading, Loading, PerformingLayout, ScriptListener}; @@ -651,15 +650,13 @@ impl ScriptTask { window.get_mut().active_timers.remove(&TimerHandle { handle: timer_data.handle, cancel_chan: None }); let js_info = page.js_info(); let this_value = if timer_data.args.len() > 0 { - unsafe { - RUST_JSVAL_TO_OBJECT(timer_data.args[0]) - } + fail!("NYI") } else { js_info.get().get_ref().js_compartment.borrow().global_obj.borrow().ptr }; // TODO: Support extra arguments. This requires passing a `*JSVal` array as `argv`. - let rval = JSVAL_NULL; + let rval = NullValue(); let cx = js_info.get().get_ref().js_context.borrow().ptr; with_gc_enabled(cx, || { unsafe { |