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

Merge fae1b20349 into 7439fa18d3

Browse source
This commit is contained in:
webbeef 2025-06-03 22:06:14 -05:00 • committed by GitHub
commit decbe3993c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/timers.rs
View file

@ -4,7 +4,7 @@
use std::cell::Cell; use std::cell::Cell;
use std::cmp::{Ord, Ordering}; use std::cmp::{Ord, Ordering};
use std::collections::HashMap; use std::collections::{HashMap, VecDeque};
use std::default::Default; use std::default::Default;
use std::rc::Rc; use std::rc::Rc;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
@ -47,7 +47,7 @@ pub(crate) struct OneshotTimers {
global_scope: Dom<GlobalScope>, global_scope: Dom<GlobalScope>,
js_timers: JsTimers, js_timers: JsTimers,
next_timer_handle: Cell<OneshotTimerHandle>, next_timer_handle: Cell<OneshotTimerHandle>,
timers: DomRefCell<Vec<OneshotTimer>>, timers: DomRefCell<VecDeque<OneshotTimer>>,
suspended_since: Cell<Option<Instant>>, suspended_since: Cell<Option<Instant>>,
/// Initially 0, increased whenever the associated document is reactivated /// Initially 0, increased whenever the associated document is reactivated
/// by the amount of ms the document was inactive. The current time can be /// by the amount of ms the document was inactive. The current time can be
@ -131,7 +131,7 @@ impl OneshotTimers {
global_scope: Dom::from_ref(global_scope), global_scope: Dom::from_ref(global_scope),
js_timers: JsTimers::default(), js_timers: JsTimers::default(),
next_timer_handle: Cell::new(OneshotTimerHandle(1)), next_timer_handle: Cell::new(OneshotTimerHandle(1)),
timers: DomRefCell::new(Vec::new()), timers: DomRefCell::new(VecDeque::new()),
suspended_since: Cell::new(None), suspended_since: Cell::new(None),
suspension_offset: Cell::new(Duration::ZERO), suspension_offset: Cell::new(Duration::ZERO),
expected_event_id: Cell::new(TimerEventId(0)), expected_event_id: Cell::new(TimerEventId(0)),
@ -180,7 +180,7 @@ impl OneshotTimers {
} }
fn is_next_timer(&self, handle: OneshotTimerHandle) -> bool { fn is_next_timer(&self, handle: OneshotTimerHandle) -> bool {
match self.timers.borrow().last() { match self.timers.borrow().back() {
None => false, None => false,
Some(max_timer) => max_timer.handle == handle, Some(max_timer) => max_timer.handle == handle,
} }
@ -201,7 +201,7 @@ impl OneshotTimers {
let base_time = self.base_time(); let base_time = self.base_time();
// 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.
if base_time < self.timers.borrow().last().unwrap().scheduled_for { if base_time < self.timers.borrow().back().unwrap().scheduled_for {
warn!("Unexpected timing!"); warn!("Unexpected timing!");
return; return;
} }
@ -213,11 +213,11 @@ impl OneshotTimers {
loop { loop {
let mut timers = self.timers.borrow_mut(); let mut timers = self.timers.borrow_mut();
if timers.is_empty() || timers.last().unwrap().scheduled_for > base_time { if timers.is_empty() || timers.back().unwrap().scheduled_for > base_time {
break; break;
} }
timers_to_run.push(timers.pop().unwrap()); timers_to_run.push(timers.pop_back().unwrap());
} }
for timer in timers_to_run { for timer in timers_to_run {
@ -286,7 +286,7 @@ impl OneshotTimers {
} }
let timers = self.timers.borrow(); let timers = self.timers.borrow();
let Some(timer) = timers.last() else { let Some(timer) = timers.back() else {
return; return;
}; };