Auto merge of #21357 - emilio:gecko-sync, r=emilio

style: Sync changes from mozilla-central.

See each individual commit.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21357)
<!-- Reviewable:end -->

1 files changed, 4 insertions, 4 deletions

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,