mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Use an enum to set set_timeout_or_interval's is_interval field. Fixes #4059
This commit is contained in:
parent
b4c3aec383
commit
89f1949913
3 changed files with 21 additions and 13 deletions
|
@ -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())
|
||||
}
|
||||
|
|
|
@ -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())
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue