Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Move animations table into PerOriginCascadeData.

Browse source
This commit is contained in:
Cameron McCormack 2017-08-07 16:19:04 +08:00
parent 781e755f9a
commit 77c4a42e5d
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/style/stylist.rs
View file

@ -97,9 +97,6 @@ pub struct Stylist {
/// The rule tree, that stores the results of selector matching. /// The rule tree, that stores the results of selector matching.
rule_tree: RuleTree, rule_tree: RuleTree,
/// A map with all the animations indexed by name.
animations: PrecomputedHashMap<Atom, KeyframesAnimation>,
/// Applicable declarations for a given non-eagerly cascaded pseudo-element. /// Applicable declarations for a given non-eagerly cascaded pseudo-element.
/// These are eagerly computed once, and then used to resolve the new /// These are eagerly computed once, and then used to resolve the new
/// computed values on the fly on layout. /// computed values on the fly on layout.
@ -235,7 +232,6 @@ impl Stylist {
effective_media_query_results: EffectiveMediaQueryResults::new(), effective_media_query_results: EffectiveMediaQueryResults::new(),
cascade_data: CascadeData::new(), cascade_data: CascadeData::new(),
animations: Default::default(),
precomputed_pseudo_element_decls: PerPseudoElementMap::default(), precomputed_pseudo_element_decls: PerPseudoElementMap::default(),
rules_source_order: 0, rules_source_order: 0,
rule_tree: RuleTree::new(), rule_tree: RuleTree::new(),
@ -303,7 +299,6 @@ impl Stylist {
self.is_device_dirty = true; self.is_device_dirty = true;
// preserve current quirks_mode value // preserve current quirks_mode value
self.cascade_data.clear(); self.cascade_data.clear();
self.animations.clear(); // Or set to Default::default()?
self.precomputed_pseudo_element_decls.clear(); self.precomputed_pseudo_element_decls.clear();
self.rules_source_order = 0; self.rules_source_order = 0;
// We want to keep rule_tree around across stylist rebuilds. // We want to keep rule_tree around across stylist rebuilds.
@ -538,14 +533,15 @@ impl Stylist {
debug!("Found valid keyframes rule: {:?}", *keyframes_rule); debug!("Found valid keyframes rule: {:?}", *keyframes_rule);
// Don't let a prefixed keyframes animation override a non-prefixed one. // Don't let a prefixed keyframes animation override a non-prefixed one.
let needs_insertion = keyframes_rule.vendor_prefix.is_none() || let needs_insertion =
self.animations.get(keyframes_rule.name.as_atom()).map_or(true, |rule| keyframes_rule.vendor_prefix.is_none() ||
rule.vendor_prefix.is_some()); origin_cascade_data.animations.get(keyframes_rule.name.as_atom())
.map_or(true, |rule| rule.vendor_prefix.is_some());
if needs_insertion { if needs_insertion {
let animation = KeyframesAnimation::from_keyframes( let animation = KeyframesAnimation::from_keyframes(
&keyframes_rule.keyframes, keyframes_rule.vendor_prefix.clone(), guard); &keyframes_rule.keyframes, keyframes_rule.vendor_prefix.clone(), guard);
debug!("Found valid keyframe animation: {:?}", animation); debug!("Found valid keyframe animation: {:?}", animation);
self.animations.insert(keyframes_rule.name.as_atom().clone(), animation); origin_cascade_data.animations.insert(keyframes_rule.name.as_atom().clone(), animation);
} }
} }
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
@ -1326,7 +1322,10 @@ impl Stylist {
/// Returns the registered `@keyframes` animation for the specified name. /// Returns the registered `@keyframes` animation for the specified name.
#[inline] #[inline]
pub fn get_animation(&self, name: &Atom) -> Option<&KeyframesAnimation> { pub fn get_animation(&self, name: &Atom) -> Option<&KeyframesAnimation> {
self.animations.get(name) self.cascade_data
.iter_origins()
.filter_map(|d| d.animations.get(name))
.next()
} }
/// Computes the match results of a given element against the set of /// Computes the match results of a given element against the set of
@ -1667,6 +1666,10 @@ struct PerOriginCascadeData {
/// Rules from stylesheets at this `CascadeData`'s origin that correspond /// Rules from stylesheets at this `CascadeData`'s origin that correspond
/// to a given pseudo-element. /// to a given pseudo-element.
pseudos_map: PerPseudoElementMap<SelectorMap<Rule>>, pseudos_map: PerPseudoElementMap<SelectorMap<Rule>>,
/// A map with all the animations at this `CascadeData`'s origin, indexed
/// by name.
animations: PrecomputedHashMap<Atom, KeyframesAnimation>,
} }
impl PerOriginCascadeData { impl PerOriginCascadeData {
@ -1674,6 +1677,7 @@ impl PerOriginCascadeData {
Self { Self {
element_map: SelectorMap::new(), element_map: SelectorMap::new(),
pseudos_map: PerPseudoElementMap::default(), pseudos_map: PerPseudoElementMap::default(),
animations: Default::default(),
} }
} }
@ -1686,7 +1690,9 @@ impl PerOriginCascadeData {
} }
fn clear(&mut self) { fn clear(&mut self) {
*self = Self::new(); self.element_map = SelectorMap::new();
self.pseudos_map = Default::default();
self.animations = Default::default();
} }
fn has_rules_for_pseudo(&self, pseudo: &PseudoElement) -> bool { fn has_rules_for_pseudo(&self, pseudo: &PseudoElement) -> bool {