diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-09-12 17:06:52 -0700 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-09-12 17:06:52 -0700 |
| commit | 18442257382d33d55b3aaec1978a57df3dfd087e (patch) | |
| tree | 18fedf217d9be388dd61c3e2242673832b421db6 /src/components/script/script_task.rs | |
| parent | 2d6d9728f0a5f4fb601b6d31c6e45003314623ee (diff) | |
| parent | 6bd4306d708d1597f46434ac32eaf1323ea7eec0 (diff) | |
| download | servo-18442257382d33d55b3aaec1978a57df3dfd087e.tar.gz servo-18442257382d33d55b3aaec1978a57df3dfd087e.zip | |
auto merge of #926 : jdm/servo/pagewhoops, r=metajack
r? @metajack
Diffstat (limited to 'src/components/script/script_task.rs')
| -rw-r--r-- | src/components/script/script_task.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index a4cf45d022a..e9c7ebdf740 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -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, |