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

auto merge of #926 : jdm/servo/pagewhoops, r=metajack

Browse source 
r? @metajack
This commit is contained in:
bors-servo 2013-09-12 17:06:52 -07:00
commit 1844225738
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/script/script_task.rs
View file

@ -504,16 +504,15 @@ impl ScriptTask {
let page = self.page_tree.find(id).expect("ScriptTask: received fire timer msg for a
pipeline ID not associated with this script task. This is a bug.").page;
unsafe {
let js_info = page.js_info.get_ref();
let this_value = if timer_data.args.len() > 0 {
RUST_JSVAL_TO_OBJECT(timer_data.args[0])
} else {
js_info.js_compartment.global_obj.ptr
page.js_info.get_ref().js_compartment.global_obj.ptr
};
// TODO: Support extra arguments. This requires passing a `*JSVal` array as `argv`.
let rval = JSVAL_NULL;
JS_CallFunctionValue(js_info.js_context.ptr,
JS_CallFunctionValue(page.js_info.get_ref().js_context.ptr,
this_value,
timer_data.funval,
0,