Include animations and transitions in the cascade #26806
+408
−310
animations: Don't always re-resolve the node style
When animations and transitions change don't always re-resolve node style, just replace the animation and transition rules and re-cascade.
- Loading branch information
commit af0bb1f7281cc029ba276c51ddc0d4d4abd34052
| @@ -17,8 +17,10 @@ use crate::dom::TNode; | ||
| use crate::invalidation::element::restyle_hints::RestyleHint; | ||
| use crate::properties::longhands::display::computed_value::T as Display; | ||
| use crate::properties::ComputedValues; | ||
| use crate::properties::PropertyDeclarationBlock; | ||
| use crate::rule_tree::{CascadeLevel, StrongRuleNode}; | ||
| use crate::selector_parser::{PseudoElement, RestyleDamage}; | ||
| use crate::shared_lock::Locked; | ||
| use crate::style_resolver::ResolvedElementStyles; | ||
| use crate::style_resolver::{PseudoElementResolution, StyleResolverForElement}; | ||
| use crate::stylist::RuleInclusion; | ||
| @@ -87,6 +89,29 @@ enum CascadeVisitedMode { | ||
| } | ||
|
|
||
| trait PrivateMatchMethods: TElement { | ||
| fn replace_single_rule_node( | ||
| context: &mut StyleContext<Self>, | ||
| level: CascadeLevel, | ||
| pdb: Option<ArcBorrow<Locked<PropertyDeclarationBlock>>>, | ||
| path: &mut StrongRuleNode, | ||
| ) -> bool { | ||
| let stylist = &context.shared.stylist; | ||
| let guards = &context.shared.guards; | ||
|
|
||
| let mut important_rules_changed = false; | ||
| let new_node = stylist.rule_tree().update_rule_at_level( | ||
| level, | ||
| pdb, | ||
| path, | ||
| guards, | ||
| &mut important_rules_changed, | ||
| ); | ||
| if let Some(n) = new_node { | ||
| *path = n; | ||
| } | ||
| important_rules_changed | ||
| } | ||
|
|
||
| /// Updates the rule nodes without re-running selector matching, using just | ||
| /// the rule tree, for a specific visited mode. | ||
| /// | ||
| @@ -98,17 +123,11 @@ trait PrivateMatchMethods: TElement { | ||
| cascade_visited: CascadeVisitedMode, | ||
| cascade_inputs: &mut ElementCascadeInputs, | ||
| ) -> bool { | ||
| use crate::properties::PropertyDeclarationBlock; | ||
| use crate::shared_lock::Locked; | ||
|
|
||
| debug_assert!( | ||
| replacements.intersects(RestyleHint::replacements()) && | ||
| (replacements & !RestyleHint::replacements()).is_empty() | ||
| ); | ||
|
|
||
| let stylist = &context.shared.stylist; | ||
| let guards = &context.shared.guards; | ||
|
|
||
| let primary_rules = match cascade_visited { | ||
| CascadeVisitedMode::Unvisited => cascade_inputs.primary.rules.as_mut(), | ||
| CascadeVisitedMode::Visited => cascade_inputs.primary.visited_rules.as_mut(), | ||
| @@ -119,34 +138,18 @@ trait PrivateMatchMethods: TElement { | ||
| None => return false, | ||
| }; | ||
|
|
||
| let replace_rule_node = |level: CascadeLevel, | ||
| pdb: Option<ArcBorrow<Locked<PropertyDeclarationBlock>>>, | ||
| path: &mut StrongRuleNode| | ||
| -> bool { | ||
| let mut important_rules_changed = false; | ||
| let new_node = stylist.rule_tree().update_rule_at_level( | ||
| level, | ||
| pdb, | ||
| path, | ||
| guards, | ||
| &mut important_rules_changed, | ||
| ); | ||
| if let Some(n) = new_node { | ||
| *path = n; | ||
| } | ||
| important_rules_changed | ||
| }; | ||
|
|
||
| if !context.shared.traversal_flags.for_animation_only() { | ||
| let mut result = false; | ||
| if replacements.contains(RestyleHint::RESTYLE_STYLE_ATTRIBUTE) { | ||
| let style_attribute = self.style_attribute(); | ||
| result |= replace_rule_node( | ||
| result |= Self::replace_single_rule_node( | ||
| context, | ||
| CascadeLevel::same_tree_author_normal(), | ||
| style_attribute, | ||
| primary_rules, | ||
| ); | ||
| result |= replace_rule_node( | ||
| result |= Self::replace_single_rule_node( | ||
| context, | ||
| CascadeLevel::same_tree_author_important(), | ||
| style_attribute, | ||
| primary_rules, | ||
| @@ -166,15 +169,17 @@ trait PrivateMatchMethods: TElement { | ||
| debug_assert!(context.shared.traversal_flags.for_animation_only()); | ||
|
|
||
| if replacements.contains(RestyleHint::RESTYLE_SMIL) { | ||
| replace_rule_node( | ||
| Self::replace_single_rule_node( | ||
| context, | ||
| CascadeLevel::SMILOverride, | ||
| self.smil_override(), | ||
| primary_rules, | ||
| ); | ||
| } | ||
|
|
||
| if replacements.contains(RestyleHint::RESTYLE_CSS_TRANSITIONS) { | ||
| replace_rule_node( | ||
| Self::replace_single_rule_node( | ||
| context, | ||
| CascadeLevel::Transitions, | ||
| self.transition_rule(&context.shared) | ||
| .as_ref() | ||
| @@ -184,7 +189,8 @@ trait PrivateMatchMethods: TElement { | ||
| } | ||
|
|
||
| if replacements.contains(RestyleHint::RESTYLE_CSS_ANIMATIONS) { | ||
| replace_rule_node( | ||
| Self::replace_single_rule_node( | ||
| context, | ||
| CascadeLevel::Animations, | ||
| self.animation_rule(&context.shared) | ||
| .as_ref() | ||
| @@ -374,12 +380,13 @@ trait PrivateMatchMethods: TElement { | ||
| &self, | ||
| context: &mut StyleContext<Self>, | ||
| old_values: &mut Option<Arc<ComputedValues>>, | ||
| new_values: &mut Arc<ComputedValues>, | ||
| new_styles: &mut ResolvedElementStyles, | ||
| restyle_hint: RestyleHint, | ||
| important_rules_changed: bool, | ||
| ) { | ||
| use crate::context::UpdateAnimationsTasks; | ||
|
|
||
| let new_values = new_styles.primary_style_mut(); | ||
| if context.shared.traversal_flags.for_animation_only() { | ||
| self.handle_display_change_for_smil_if_needed( | ||
| context, | ||
| @@ -458,10 +465,65 @@ trait PrivateMatchMethods: TElement { | ||
| &self, | ||
| context: &mut StyleContext<Self>, | ||
| old_values: &mut Option<Arc<ComputedValues>>, | ||
| new_values: &mut Arc<ComputedValues>, | ||
| new_resolved_styles: &mut ResolvedElementStyles, | ||
| _restyle_hint: RestyleHint, | ||
| _important_rules_changed: bool, | ||
| ) { | ||
| if !self.process_animations_for_style( | ||
| context, | ||
| old_values, | ||
| new_resolved_styles.primary_style_mut(), | ||
| ) { | ||
| return; | ||
| } | ||
|
|
||
| // If we have modified animation or transitions, we recascade style for this node. | ||
| let mut rule_node = new_resolved_styles.primary_style().rules().clone(); | ||
| Self::replace_single_rule_node( | ||
| context, | ||
| CascadeLevel::Transitions, | ||
| self.transition_rule(&context.shared) | ||
| .as_ref() | ||
| .map(|a| a.borrow_arc()), | ||
| &mut rule_node, | ||
| ); | ||
| Self::replace_single_rule_node( | ||
| context, | ||
| CascadeLevel::Animations, | ||
| self.animation_rule(&context.shared) | ||
| .as_ref() | ||
| .map(|a| a.borrow_arc()), | ||
| &mut rule_node, | ||
| ); | ||
|
||
|
|
||
| // If these animations haven't modified the rule now, we can just exit early. | ||
| if rule_node == *new_resolved_styles.primary_style().rules() { | ||
| return; | ||
| } | ||
|
|
||
| let inputs = CascadeInputs { | ||
| rules: Some(rule_node), | ||
| visited_rules: new_resolved_styles.primary_style().visited_rules().cloned(), | ||
| }; | ||
|
|
||
| let style = StyleResolverForElement::new( | ||
| *self, | ||
| context, | ||
| RuleInclusion::All, | ||
| PseudoElementResolution::IfApplicable, | ||
| ) | ||
| .cascade_style_and_visited_with_default_parents(inputs); | ||
|
|
||
| new_resolved_styles.primary.style = style; | ||
| } | ||
|
|
||
| #[cfg(feature = "servo")] | ||
| fn process_animations_for_style( | ||
| &self, | ||
| context: &mut StyleContext<Self>, | ||
| old_values: &mut Option<Arc<ComputedValues>>, | ||
| new_values: &mut Arc<ComputedValues>, | ||
| ) -> bool { | ||
| use crate::animation::AnimationState; | ||
|
|
||
| // We need to call this before accessing the `ElementAnimationSet` from the | ||
| @@ -533,17 +595,7 @@ trait PrivateMatchMethods: TElement { | ||
| .insert(this_opaque, animation_set); | ||
| } | ||
|
|
||
| // If we have modified animation or transitions, we recascade style for this node. | ||
| if changed_animations { | ||
| let mut resolver = StyleResolverForElement::new( | ||
| *self, | ||
| context, | ||
| RuleInclusion::All, | ||
| PseudoElementResolution::IfApplicable, | ||
| ); | ||
| let new_primary = resolver.resolve_style_with_default_parents(); | ||
| *new_values = new_primary.primary.style.0; | ||
| } | ||
| changed_animations | ||
| } | ||
|
|
||
| /// Computes and applies non-redundant damage. | ||
| @@ -709,7 +761,7 @@ pub trait MatchMethods: TElement { | ||
| self.process_animations( | ||
| context, | ||
| &mut data.styles.primary, | ||
| &mut new_styles.primary.style.0, | ||
| &mut new_styles, | ||
| data.hint, | ||
| important_rules_changed, | ||
| ); | ||
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
May be worth either asserting that
rule_nodeis not the primary style's rule node anymore, or check for that and bail out.