Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename remove_animation_and_transition_rules to just remove_animation_rules

Browse source 
Now this method covers SMIL override rules, CSS animation / script
animation rules, and CSS transition rules so we should just use
"animation" in the generic sense.
This commit is contained in:
Brian Birtles 2017-04-27 12:36:09 +09:00
parent 2c3c9d673d
commit ba118dfe69
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/matching.rs
View file

@ -1334,7 +1334,7 @@ pub trait MatchMethods : TElement {
let relevant_style = pseudo_style.unwrap_or(primary_style); let relevant_style = pseudo_style.unwrap_or(primary_style);
let rule_node = &relevant_style.rules; let rule_node = &relevant_style.rules;
let without_animation_rules = let without_animation_rules =
shared_context.stylist.rule_tree.remove_animation_and_transition_rules(rule_node); shared_context.stylist.rule_tree.remove_animation_rules(rule_node);
if without_animation_rules == *rule_node { if without_animation_rules == *rule_node {
// Note that unwrapping here is fine, because the style is // Note that unwrapping here is fine, because the style is
// only incomplete during the styling process. // only incomplete during the styling process.

2
components/style/rule_tree/mod.rs
View file

@ -255,7 +255,7 @@ impl RuleTree {
} }
/// Returns new rule node without rules from declarative animations. /// Returns new rule node without rules from declarative animations.
pub fn remove_animation_and_transition_rules(&self, path: &StrongRuleNode) -> StrongRuleNode { pub fn remove_animation_rules(&self, path: &StrongRuleNode) -> StrongRuleNode {
// Return a clone if there are no animation rules. // Return a clone if there are no animation rules.
if !path.has_animation_or_transition_rules() { if !path.has_animation_or_transition_rules() {
return path.clone(); return path.clone();