diff options
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/layout/animation.rs | 9 | ||||
| -rw-r--r-- | components/layout/lib.rs | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 3add6b14976..9c83648128a 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -38,7 +38,6 @@ smallvec = "0.1" string_cache = {version = "0.2.20", features = ["heap_size"]} style = {path = "../style"} style_traits = {path = "../style_traits"} -time = "0.1" unicode-bidi = "0.2" unicode-script = {version = "0.1", features = ["harfbuzz"]} url = {version = "1.0.0", features = ["heap_size"]} diff --git a/components/layout/animation.rs b/components/layout/animation.rs index 4087479ed47..5a67b1af5bf 100644 --- a/components/layout/animation.rs +++ b/components/layout/animation.rs @@ -14,7 +14,7 @@ use script_traits::{AnimationState, LayoutMsg as ConstellationMsg}; use std::collections::HashMap; use std::sync::mpsc::Receiver; use style::animation::{Animation, update_style_for_animation}; -use time; +use style::timer::Timer; /// Processes any new animations that were discovered after style recalculation. /// Also expire any old animations that have completed, inserting them into @@ -23,7 +23,8 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>, running_animations: &mut HashMap<OpaqueNode, Vec<Animation>>, expired_animations: &mut HashMap<OpaqueNode, Vec<Animation>>, new_animations_receiver: &Receiver<Animation>, - pipeline_id: PipelineId) { + pipeline_id: PipelineId, + timer: &Timer) { let mut new_running_animations = vec![]; while let Ok(animation) = new_animations_receiver.try_recv() { let mut should_push = true; @@ -37,7 +38,7 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>, if let Animation::Keyframes(_, ref anim_name, ref mut anim_state) = *anim { if *name == *anim_name { debug!("update_animation_state: Found other animation {}", name); - anim_state.update_from_other(&state); + anim_state.update_from_other(&state, timer); should_push = false; break; } @@ -57,7 +58,7 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>, return } - let now = time::precise_time_s(); + let now = timer.seconds(); // Expire old running animations. // // TODO: Do not expunge Keyframes animations, since we need that state if diff --git a/components/layout/lib.rs b/components/layout/lib.rs index f05b21c3628..b6f10c7fa89 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -50,7 +50,6 @@ extern crate smallvec; #[macro_use(atom, ns)] extern crate string_cache; extern crate style; extern crate style_traits; -extern crate time; extern crate unicode_bidi; extern crate unicode_script; extern crate url; |