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

Combine AnimationAndTransitionDeclarations and AnimationRules

Browse source 
These two structs are very similar, so we can combine them.
This commit is contained in:
Martin Robinson 2020-06-16 19:13:52 +02:00
parent a84b06065b
commit 36701e0223
6 changed files with 38 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/style_resolver.rs
View file

@ -10,7 +10,7 @@ use crate::data::{EagerPseudoStyles, ElementStyles};
use crate::dom::TElement;
use crate::matching::MatchMethods;
use crate::properties::longhands::display::computed_value::T as Display;
use crate::properties::{AnimationRules, ComputedValues};
use crate::properties::ComputedValues;
use crate::rule_tree::StrongRuleNode;
use crate::selector_parser::{PseudoElement, SelectorImpl};
use crate::stylist::RuleInclusion;
@ -473,7 +473,7 @@ where
implemented_pseudo.as_ref(),
self.element.style_attribute(),
self.element.smil_override(),
self.element.animation_rules(self.context.shared),
self.element.animation_declarations(self.context.shared),
self.rule_inclusion,
&mut applicable_declarations,
&mut matching_context,
@ -552,7 +552,7 @@ where
Some(pseudo_element),
None,
None,
AnimationRules(None, None),
/* animation_declarations = */ Default::default(),
self.rule_inclusion,
&mut applicable_declarations,
&mut matching_context,