diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-12 18:32:37 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-12 18:32:37 +0530 |
commit | 53c4a782a0906c487139d4b6f3c62d9eca3f9f17 (patch) | |
tree | 4aa4d1443868a683b8d7898dbedf535e1a727f66 /components/script/timers.rs | |
parent | 6b1e73c1c0cf3fe2c935df0de667145bc6130461 (diff) | |
parent | ce6075825d9e21b9b59d7d7230268745c087d617 (diff) | |
download | servo-53c4a782a0906c487139d4b6f3c62d9eca3f9f17.tar.gz servo-53c4a782a0906c487139d4b6f3c62d9eca3f9f17.zip |
Auto merge of #9255 - ckimes89:remove-globalfield, r=nox
Remove global fields from DOM objects
Fixes #9227
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9255)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/timers.rs')
-rw-r--r-- | components/script/timers.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/components/script/timers.rs b/components/script/timers.rs index 786cfbf4c6f..7f608f98f46 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -5,7 +5,6 @@ use dom::bindings::callback::ExceptionHandling::Report; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::FunctionBinding::Function; -use dom::bindings::global::global_root_from_reflector; use dom::bindings::reflector::Reflectable; use dom::bindings::trace::JSTraceable; use dom::window::ScriptHelpers; @@ -289,7 +288,7 @@ impl ActiveTimers { // step 14 match callback { InternalTimerCallback::StringTimerCallback(code_str) => { - let cx = global_root_from_reflector(this).r().get_cx(); + let cx = this.global().r().get_cx(); let mut rval = RootedValue::new(cx, UndefinedValue()); this.evaluate_js_on_global_with_result(&code_str, rval.handle_mut()); |