servo: Merge #11700 - Remove an invalid assertion in fire_timer (from Ms2ger:assert); r=jdm

It's not clear to me if this is something we should expect to happen, but it
does indeed happen, so we should disable the assertion while we investigate.

Fixes #9984.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3fa0dca3a32552a83ae020c57535346d9cdf3bdd
This commit is contained in:
Ms2ger 2016-06-11 18:42:53 -05:00
parent 2120477f7d
commit 217d64df6d

View File

@ -176,7 +176,10 @@ impl OneshotTimers {
let base_time = self.base_time();
// Since the event id was the expected one, at least one timer should be due.
assert!(base_time >= self.timers.borrow().last().unwrap().scheduled_for);
if base_time < self.timers.borrow().last().unwrap().scheduled_for {
warn!("Unexpected timing!");
return;
}
// select timers to run to prevent firing timers
// that were installed during fire of another timer