From ba118dfe69fe8cf97ee0b97a077dfd3b7c8fa99b Mon Sep 17 00:00:00 2001 From: Brian Birtles Date: Thu, 27 Apr 2017 12:36:09 +0900 Subject: [PATCH] Rename remove_animation_and_transition_rules to just remove_animation_rules 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. --- components/style/matching.rs | 2 +- components/style/rule_tree/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/style/matching.rs b/components/style/matching.rs index e1e64906f1c..c9d24fb0e38 100644 --- a/components/style/matching.rs +++ b/components/style/matching.rs @@ -1334,7 +1334,7 @@ pub trait MatchMethods : TElement { let relevant_style = pseudo_style.unwrap_or(primary_style); let rule_node = &relevant_style.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 { // Note that unwrapping here is fine, because the style is // only incomplete during the styling process. diff --git a/components/style/rule_tree/mod.rs b/components/style/rule_tree/mod.rs index 1ec22e8b277..fa6acaa92b5 100644 --- a/components/style/rule_tree/mod.rs +++ b/components/style/rule_tree/mod.rs @@ -255,7 +255,7 @@ impl RuleTree { } /// 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. if !path.has_animation_or_transition_rules() { return path.clone();