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

fix intermittent Option::unwrap in timers

Browse source 
not allow to fire timers installed during another timer call
This commit is contained in:
Aleksandr Likhanov 2015-12-02 02:09:50 +05:00
parent a8cbc28643
commit d891e75d9d
4 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/timers.rs
View file

@ -23,7 +23,7 @@ use std::rc::Rc;
use util::mem::HeapSizeOf; use util::mem::HeapSizeOf;
use util::str::DOMString; use util::str::DOMString;
#[derive(JSTraceable, PartialEq, Eq, Copy, Clone, HeapSizeOf, Hash, PartialOrd, Ord)] #[derive(JSTraceable, PartialEq, Eq, Copy, Clone, HeapSizeOf, Hash, PartialOrd, Ord, Debug)]
pub struct TimerHandle(i32); pub struct TimerHandle(i32);
#[derive(JSTraceable, HeapSizeOf)] #[derive(JSTraceable, HeapSizeOf)]
@ -253,16 +253,22 @@ impl ActiveTimers {
// Since the event id was the expected one, at least one timer should be due. // Since the event id was the expected one, at least one timer should be due.
assert!(base_time >= self.timers.borrow().last().unwrap().next_call); assert!(base_time >= self.timers.borrow().last().unwrap().next_call);
// select timers to run to prevent firing timers
// that were installed during fire of another timer
let mut timers_to_run: Vec<Timer> = Vec::new();
loop { loop {
let timer = { let mut timers = self.timers.borrow_mut();
let mut timers = self.timers.borrow_mut();
if timers.is_empty() || timers.last().unwrap().next_call > base_time { if timers.is_empty() || timers.last().unwrap().next_call > base_time {
break; break;
} }
timers_to_run.push(timers.pop().unwrap());
}
for timer in timers_to_run {
timers.pop().unwrap()
};
let callback = timer.callback.clone(); let callback = timer.callback.clone();
// prep for step 6 in nested set_timeout_or_interval calls // prep for step 6 in nested set_timeout_or_interval calls

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -5661,6 +5661,12 @@
"url": "/_mozilla/mozilla/textcontent.html" "url": "/_mozilla/mozilla/textcontent.html"
} }
], ],
"mozilla/timer_eventInvalidation.html": [
{
"path": "mozilla/timer_eventInvalidation.html",
"url": "/_mozilla/mozilla/timer_eventInvalidation.html"
}
],
"mozilla/title.html": [ "mozilla/title.html": [
{ {
"path": "mozilla/title.html", "path": "mozilla/title.html",

21
tests/wpt/mozilla/tests/mozilla/timer_eventInvalidation.html Normal file
View file

@ -0,0 +1,21 @@
<html>
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
async_test(function(test) {
// couldn't reproduce this behaviour without iframe
var iframe = document.createElement('iframe');
window.addEventListener('test_done', function() {
// if event invalidation is not properly implemented
// servo will crash during a short period of time
setTimeout(() => test.done(), 50);
}, false);
iframe.src = 'timer_eventInvalidation_test.html';
document.body.appendChild(iframe);
});
</script>
</body>
</html>

14
tests/wpt/mozilla/tests/mozilla/timer_eventInvalidation_test.html Normal file
View file

@ -0,0 +1,14 @@
<html>
<head>
</head>
<body>
<script>
setTimeout(function() {
setTimeout(function() {
var e = new Event('test_done');
window.parent.dispatchEvent(e);
}, 0);
}, 0);
</script>
</body>
</html>