diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-18 09:39:56 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-18 09:39:56 -0700 |
| commit | 7df37847d3a0a02da6917c669fe62a5e4af7efcd (patch) | |
| tree | 14c626bdf0db9e91df41f05129d80a3631f0971f /components/script/dom | |
| parent | d7f38a8973c1baac2a68bd83a0c141deef920bac (diff) | |
| parent | e4b029623f913261785f5a1ecb244e8faeca12a2 (diff) | |
| download | servo-7df37847d3a0a02da6917c669fe62a5e4af7efcd.tar.gz servo-7df37847d3a0a02da6917c669fe62a5e4af7efcd.zip | |
auto merge of #4416 : mattnenterprise/servo/fire-timer-clone, r=jdm
I tested that it worked correctly by using running './mach run tests/html/test_timeout.html' and making sure the timers went off.
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/window.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/workerglobalscope.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 8142b455f99..27e852a6aac 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -357,7 +357,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> { } fn handle_fire_timer(self, timer_id: TimerId) { - self.timers.fire_timer(timer_id, self.clone()); + self.timers.fire_timer(timer_id, self); self.flush_layout(ReflowForDisplay, NoQuery); } } diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index f1dcbd5adfd..7d1356f0e34 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -181,7 +181,7 @@ pub trait WorkerGlobalScopeHelpers { impl<'a> WorkerGlobalScopeHelpers for JSRef<'a, WorkerGlobalScope> { fn handle_fire_timer(self, timer_id: TimerId) { - self.timers.fire_timer(timer_id, self.clone()); + self.timers.fire_timer(timer_id, self); } } |