aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/Cargo.toml1
-rw-r--r--components/layout/animation.rs8
-rw-r--r--components/layout/lib.rs1
3 files changed, 6 insertions, 4 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index d0604de2c48..ac387d59585 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -18,6 +18,7 @@ bitflags = "1.0"
canvas_traits = {path = "../canvas_traits"}
euclid = "0.19"
fnv = "1.0"
+fxhash = "0.2"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
html5ever = "0.22"
diff --git a/components/layout/animation.rs b/components/layout/animation.rs
index 05718dda00a..3a09094b2a9 100644
--- a/components/layout/animation.rs
+++ b/components/layout/animation.rs
@@ -7,7 +7,7 @@
use context::LayoutContext;
use display_list::items::OpaqueNode;
use flow::{Flow, GetBaseFlow};
-use fnv::FnvHashMap;
+use fxhash::FxHashMap;
use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::PipelineId;
use opaque_node::OpaqueNodeMethods;
@@ -26,8 +26,8 @@ use style::timer::Timer;
pub fn update_animation_state<E>(
constellation_chan: &IpcSender<ConstellationMsg>,
script_chan: &IpcSender<ConstellationControlMsg>,
- running_animations: &mut FnvHashMap<OpaqueNode, Vec<Animation>>,
- expired_animations: &mut FnvHashMap<OpaqueNode, Vec<Animation>>,
+ running_animations: &mut FxHashMap<OpaqueNode, Vec<Animation>>,
+ expired_animations: &mut FxHashMap<OpaqueNode, Vec<Animation>>,
mut newly_transitioning_nodes: Option<&mut Vec<UntrustedNodeAddress>>,
new_animations_receiver: &Receiver<Animation>,
pipeline_id: PipelineId,
@@ -153,7 +153,7 @@ where
pub fn recalc_style_for_animations<E>(
context: &LayoutContext,
flow: &mut Flow,
- animations: &FnvHashMap<OpaqueNode, Vec<Animation>>,
+ animations: &FxHashMap<OpaqueNode, Vec<Animation>>,
)
where
E: TElement,
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index bb3a3dc20b2..c0c5633ca24 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -11,6 +11,7 @@ extern crate bitflags;
extern crate canvas_traits;
extern crate euclid;
extern crate fnv;
+extern crate fxhash;
extern crate gfx;
extern crate gfx_traits;
#[macro_use] extern crate html5ever;