diff options
author | Martin Robinson <mrobinson@igalia.com> | 2020-06-15 09:21:35 +0200 |
---|---|---|
committer | Martin Robinson <mrobinson@igalia.com> | 2020-06-15 10:28:30 +0200 |
commit | 4a3995bb375d43d53666a348ec0c08065784f6ea (patch) | |
tree | 31d9e41a4f5a5d0aac67a4265f828e9793b6855e /components/script_layout_interface | |
parent | 6b0d9afd6fdc28356ad44af0104ddd25a7b6438d (diff) | |
download | servo-4a3995bb375d43d53666a348ec0c08065784f6ea.tar.gz servo-4a3995bb375d43d53666a348ec0c08065784f6ea.zip |
Add DocumentAnimationSet and AnimationSetKey
This will be used in order to hold animations for pseudo elements in the
DocumentAnimationSet. Also no longer store the OpaqueNode in the
animation and transition data structures. This is already part of the
DocumentAnimationSet key.
Diffstat (limited to 'components/script_layout_interface')
-rw-r--r-- | components/script_layout_interface/message.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs index 724cd2b79e7..2d1ca34eef3 100644 --- a/components/script_layout_interface/message.rs +++ b/components/script_layout_interface/message.rs @@ -7,13 +7,11 @@ use crate::{PendingImage, TrustedNodeAddress}; use app_units::Au; use crossbeam_channel::{Receiver, Sender}; use euclid::default::{Point2D, Rect}; -use fxhash::FxHashMap; use gfx_traits::Epoch; use ipc_channel::ipc::{IpcReceiver, IpcSender}; use metrics::PaintTimeMetrics; use msg::constellation_msg::{BackgroundHangMonitorRegister, BrowsingContextId, PipelineId}; use net_traits::image_cache::ImageCache; -use parking_lot::RwLock; use profile_traits::mem::ReportsChan; use script_traits::Painter; use script_traits::{ @@ -25,7 +23,7 @@ use servo_atoms::Atom; use servo_url::{ImmutableOrigin, ServoUrl}; use std::sync::atomic::AtomicBool; use std::sync::Arc; -use style::animation::ElementAnimationSet; +use style::animation::DocumentAnimationSet; use style::context::QuirksMode; use style::dom::OpaqueNode; use style::invalidation::element::restyle_hints::RestyleHint; @@ -215,7 +213,7 @@ pub struct ScriptReflow { /// The current animation timeline value. pub animation_timeline_value: f64, /// The set of animations for this document. - pub animations: ServoArc<RwLock<FxHashMap<OpaqueNode, ElementAnimationSet>>>, + pub animations: DocumentAnimationSet, } pub struct LayoutThreadInit { |