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

auto merge of #2405 : Ms2ger/servo/active_timers, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-05-12 13:52:43 -04:00
commit 1657a142cc
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/script/dom/window.rs
View file

@ -70,7 +70,7 @@ pub struct Window {
pub location: Option<JS<Location>>, pub location: Option<JS<Location>>,
pub navigator: Option<JS<Navigator>>, pub navigator: Option<JS<Navigator>>,
pub image_cache_task: ImageCacheTask, pub image_cache_task: ImageCacheTask,
pub active_timers: ~HashMap<TimerId, TimerHandle>, pub active_timers: HashMap<TimerId, TimerHandle>,
pub next_timer_handle: i32, pub next_timer_handle: i32,
pub compositor: Untraceable<~ScriptListener>, pub compositor: Untraceable<~ScriptListener>,
pub browser_context: Option<BrowserContext>, pub browser_context: Option<BrowserContext>,
@ -380,7 +380,7 @@ impl Window {
location: None, location: None,
navigator: None, navigator: None,
image_cache_task: image_cache_task, image_cache_task: image_cache_task,
active_timers: ~HashMap::new(), active_timers: HashMap::new(),
next_timer_handle: 0, next_timer_handle: 0,
browser_context: None, browser_context: None,
performance: None, performance: None,