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

auto merge of #4416 : mattnenterprise/servo/fire-timer-clone, r=jdm

Browse source 
I tested that it worked correctly by using running './mach run tests/html/test_timeout.html' and making sure the timers went off.
This commit is contained in:
bors-servo 2014-12-18 09:39:56 -07:00
commit 7df37847d3
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/window.rs
View file

@ -357,7 +357,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
} }
fn handle_fire_timer(self, timer_id: TimerId) { 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); self.flush_layout(ReflowForDisplay, NoQuery);
} }
} }

2
components/script/dom/workerglobalscope.rs
View file

@ -181,7 +181,7 @@ pub trait WorkerGlobalScopeHelpers {
impl<'a> WorkerGlobalScopeHelpers for JSRef<'a, WorkerGlobalScope> { impl<'a> WorkerGlobalScopeHelpers for JSRef<'a, WorkerGlobalScope> {
fn handle_fire_timer(self, timer_id: TimerId) { fn handle_fire_timer(self, timer_id: TimerId) {
self.timers.fire_timer(timer_id, self.clone()); self.timers.fire_timer(timer_id, self);
} }
} }