diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-04 01:15:43 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-10-06 21:35:50 +0200 |
commit | 9c04eb60bdcb31221d93f8d6b7ebcb3728836625 (patch) | |
tree | dd17a202ed5b685e93bada52ca6d0dc42843572c /components/script/timers.rs | |
parent | 19108aa3305df2172208c83500f5ac67d2dee104 (diff) | |
download | servo-9c04eb60bdcb31221d93f8d6b7ebcb3728836625.tar.gz servo-9c04eb60bdcb31221d93f8d6b7ebcb3728836625.zip |
Move JS evaluation functions to GlobalScope
Diffstat (limited to 'components/script/timers.rs')
-rw-r--r-- | components/script/timers.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/timers.rs b/components/script/timers.rs index 601755c6fc4..7b326f6b164 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -489,11 +489,11 @@ impl JsTimerTask { // step 4.2 match *&self.callback { InternalTimerCallback::StringTimerCallback(ref code_str) => { - let global = this.global(); - let cx = global.r().get_cx(); + let global = this.global_scope(); + let cx = global.get_cx(); rooted!(in(cx) let mut rval = UndefinedValue()); - global.r().evaluate_js_on_global_with_result( + global.evaluate_js_on_global_with_result( code_str, rval.handle_mut()); }, InternalTimerCallback::FunctionTimerCallback(ref function, ref arguments) => { |