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

Use an enum to set set_timeout_or_interval's is_interval field. Fixes #4059

Browse source
This commit is contained in:
Trevor Riles 2014-11-21 15:10:27 -06:00
parent b4c3aec383
commit 89f1949913
3 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/window.rs
View file

@ -25,7 +25,7 @@ use page::Page;
use script_task::{ExitWindowMsg, ScriptChan, TriggerLoadMsg, TriggerFragmentMsg};
use script_task::FromWindow;
use script_traits::ScriptControlChan;
use timers::{TimerId, TimerManager};
use timers::{Interval, NonInterval, TimerId, TimerManager};
use servo_msg::compositor_msg::ScriptListener;
use servo_msg::constellation_msg::LoadData;
@ -228,7 +228,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
self.timers.set_timeout_or_interval(callback,
args,
timeout,
false, // is_interval
NonInterval, // is_interval
FromWindow(self.page.id.clone()),
self.script_chan.clone())
}
@ -241,7 +241,7 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
self.timers.set_timeout_or_interval(callback,
args,
timeout,
true, // is_interval
Interval, // is_interval
FromWindow(self.page.id.clone()),
self.script_chan.clone())
}

6
components/script/dom/workerglobalscope.rs
View file

@ -14,7 +14,7 @@ use dom::workerlocation::WorkerLocation;
use dom::workernavigator::WorkerNavigator;
use dom::window::{base64_atob, base64_btoa};
use script_task::{ScriptChan, FromWorker};
use timers::{TimerId, TimerManager};
use timers::{Interval, NonInterval, TimerId, TimerManager};
use servo_net::resource_task::{ResourceTask, load_whole_resource};
use servo_util::str::DOMString;
@ -160,7 +160,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
self.timers.set_timeout_or_interval(callback,
args,
timeout,
false, // is_interval
NonInterval, // is_interval
FromWorker,
self.script_chan.clone())
}
@ -173,7 +173,7 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> {
self.timers.set_timeout_or_interval(callback,
args,
timeout,
true, // is_interval
Interval, // is_interval
FromWorker,
self.script_chan.clone())
}

22
components/script/timers.rs
View file

@ -66,6 +66,14 @@ impl Drop for TimerManager {
}
}
// Enum allowing more descriptive values for the is_interval field
#[jstraceable]
#[deriving(PartialEq, Clone)]
pub enum IsInterval {
Interval,
NonInterval,
}
// Holder for the various JS values associated with setTimeout
// (ie. function value to invoke and all arguments to pass
// to the function when calling it)
@ -74,7 +82,7 @@ impl Drop for TimerManager {
#[privatize]
#[deriving(Clone)]
struct TimerData {
is_interval: bool,
is_interval: IsInterval,
funval: Function,
args: Vec<JSVal>
}
@ -91,7 +99,7 @@ impl TimerManager {
callback: Function,
arguments: Vec<JSVal>,
timeout: i32,
is_interval: bool,
is_interval: IsInterval,
source: TimerSource,
script_chan: ScriptChan)
-> i32 {
@ -104,15 +112,15 @@ impl TimerManager {
let tm = Timer::new().unwrap();
let (cancel_chan, cancel_port) = channel();
let spawn_name = match source {
FromWindow(_) if is_interval => "Window:SetInterval",
FromWorker if is_interval => "Worker:SetInterval",
FromWindow(_) if is_interval == IsInterval::Interval => "Window:SetInterval",
FromWorker if is_interval == IsInterval::Interval => "Worker:SetInterval",
FromWindow(_) => "Window:SetTimeout",
FromWorker => "Worker:SetTimeout",
};
spawn_named(spawn_name, proc() {
let mut tm = tm;
let duration = Duration::milliseconds(timeout as i64);
let timeout_port = if is_interval {
let timeout_port = if is_interval == IsInterval::Interval {
tm.periodic(duration)
} else {
tm.oneshot(duration)
@ -131,7 +139,7 @@ impl TimerManager {
timeout_port.recv();
let ScriptChan(ref chan) = script_chan;
chan.send(FireTimerMsg(source, TimerId(handle)));
if !is_interval {
if is_interval == IsInterval::NonInterval {
break;
}
} else if id == cancel_handle.id() {
@ -171,7 +179,7 @@ impl TimerManager {
// TODO: Must handle rooting of funval and args when movable GC is turned on
let _ = data.funval.Call_(this, data.args, ReportExceptions);
if !data.is_interval {
if data.is_interval == IsInterval::NonInterval {
self.active_timers.borrow_mut().remove(&timer_id);
}
}