diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-19 01:58:30 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-19 01:58:30 +0530 |
| commit | d11442bdcccf4002cdb84e85fe726130047a2b07 (patch) | |
| tree | 9ab4bdbc19f6494be9baab61e7ce5f1a481fa386 /components/script | |
| parent | 2be0cb7827c6553b7dfa4d641bf3a1c72372ad3b (diff) | |
| parent | 54e41fb22d6bf4adaa03e2e323581e4b27c244c2 (diff) | |
| download | servo-d11442bdcccf4002cdb84e85fe726130047a2b07.tar.gz servo-d11442bdcccf4002cdb84e85fe726130047a2b07.zip | |
Auto merge of #8591 - benschulz:im-a-toddler, r=jdm
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 -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/timers.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/components/script/timers.rs b/components/script/timers.rs index aa6ce6e68c2..4b8a2b6d272 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -194,8 +194,6 @@ impl ActiveTimers { duration: MsDuration, is_interval: IsInterval, source: TimerSource) -> TimerHandle { - assert!(self.suspended_since.get().is_none()); - // step 3 let TimerHandle(new_handle) = self.next_timer_handle.get(); self.next_timer_handle.set(TimerHandle(new_handle + 1)); |