diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-05-12 13:52:43 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-05-12 13:52:43 -0400 |
| commit | 1657a142cc3020a27eb061cb8b5ae5550d7dd004 (patch) | |
| tree | 8d2ff2620d55a97df066845f788e78548967a6c4 /src | |
| parent | b036bee532fafe3733eb3cb2ccad98fa85c23a92 (diff) | |
| parent | ab5bf8044703630430da64a553aed21abb96432f (diff) | |
| download | servo-1657a142cc3020a27eb061cb8b5ae5550d7dd004.tar.gz servo-1657a142cc3020a27eb061cb8b5ae5550d7dd004.zip | |
auto merge of #2405 : Ms2ger/servo/active_timers, r=jdm
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/script/dom/window.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index ab51a5f457c..7e366492719 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -70,7 +70,7 @@ pub struct Window { pub location: Option<JS<Location>>, pub navigator: Option<JS<Navigator>>, pub image_cache_task: ImageCacheTask, - pub active_timers: ~HashMap<TimerId, TimerHandle>, + pub active_timers: HashMap<TimerId, TimerHandle>, pub next_timer_handle: i32, pub compositor: Untraceable<~ScriptListener>, pub browser_context: Option<BrowserContext>, @@ -380,7 +380,7 @@ impl Window { location: None, navigator: None, image_cache_task: image_cache_task, - active_timers: ~HashMap::new(), + active_timers: HashMap::new(), next_timer_handle: 0, browser_context: None, performance: None, |