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

Auto merge of #8591 - benschulz:im-a-toddler, r=jdm

Browse source 
Correct undisciplined rebase. (Closes #8583.)

I screwed up the rebase on top of #8175; sorry to waste your time with this, @jdm. :(

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8591)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-19 01:58:30 +05:30
commit d11442bdcc
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/timers.rs
View file

@ -194,8 +194,6 @@ impl ActiveTimers {
duration: MsDuration, duration: MsDuration,
is_interval: IsInterval, is_interval: IsInterval,
source: TimerSource) -> TimerHandle { source: TimerSource) -> TimerHandle {
assert!(self.suspended_since.get().is_none());
// step 3 // step 3
let TimerHandle(new_handle) = self.next_timer_handle.get(); let TimerHandle(new_handle) = self.next_timer_handle.get();
self.next_timer_handle.set(TimerHandle(new_handle + 1)); self.next_timer_handle.set(TimerHandle(new_handle + 1));