diff --git a/components/style/dom.rs b/components/style/dom.rs index 2e304ba09fa..4ba5d27e8ea 100644 --- a/components/style/dom.rs +++ b/components/style/dom.rs @@ -438,31 +438,28 @@ pub trait TElement } /// Get this element's SMIL override declarations. - fn get_smil_override(&self) -> Option>> { + fn smil_override(&self) -> Option>> { None } /// Get the combined animation and transition rules. - fn get_animation_rules(&self) -> AnimationRules { + /// + /// FIXME(emilio): Is this really useful? + fn animation_rules(&self) -> AnimationRules { if !self.may_have_animations() { return AnimationRules(None, None) } - AnimationRules( - self.get_animation_rule(), - self.get_transition_rule(), - ) + AnimationRules(self.animation_rule(), self.transition_rule()) } /// Get this element's animation rule. - fn get_animation_rule(&self) - -> Option>> { + fn animation_rule(&self) -> Option>> { None } /// Get this element's transition rule. - fn get_transition_rule(&self) - -> Option>> { + fn transition_rule(&self) -> Option>> { None } diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs index 04cf374671a..d243d0f5879 100644 --- a/components/style/gecko/wrapper.rs +++ b/components/style/gecko/wrapper.rs @@ -1060,7 +1060,7 @@ impl<'le> TElement for GeckoElement<'le> { unsafe { Gecko_UnsetDirtyStyleAttr(self.0) }; } - fn get_smil_override(&self) -> Option>> { + fn smil_override(&self) -> Option>> { unsafe { let slots = self.get_extended_slots()?; @@ -1084,15 +1084,11 @@ impl<'le> TElement for GeckoElement<'le> { } } - fn get_animation_rule( - &self, - ) -> Option>> { + fn animation_rule(&self) -> Option>> { get_animation_rule(self, CascadeLevel::Animations) } - fn get_transition_rule( - &self, - ) -> Option>> { + fn transition_rule(&self) -> Option>> { get_animation_rule(self, CascadeLevel::Transitions) } diff --git a/components/style/matching.rs b/components/style/matching.rs index c1ead77c8da..73ad9c20573 100644 --- a/components/style/matching.rs +++ b/components/style/matching.rs @@ -766,7 +766,7 @@ pub trait MatchMethods : TElement { if replacements.contains(RestyleHint::RESTYLE_SMIL) { replace_rule_node( CascadeLevel::SMILOverride, - self.get_smil_override(), + self.smil_override(), primary_rules, ); } @@ -774,7 +774,7 @@ pub trait MatchMethods : TElement { if replacements.contains(RestyleHint::RESTYLE_CSS_TRANSITIONS) { replace_rule_node( CascadeLevel::Transitions, - self.get_transition_rule().as_ref().map(|a| a.borrow_arc()), + self.transition_rule().as_ref().map(|a| a.borrow_arc()), primary_rules, ); } @@ -782,7 +782,7 @@ pub trait MatchMethods : TElement { if replacements.contains(RestyleHint::RESTYLE_CSS_ANIMATIONS) { replace_rule_node( CascadeLevel::Animations, - self.get_animation_rule().as_ref().map(|a| a.borrow_arc()), + self.animation_rule().as_ref().map(|a| a.borrow_arc()), primary_rules, ); } diff --git a/components/style/style_resolver.rs b/components/style/style_resolver.rs index b07dfb487b9..99cc0ac3363 100644 --- a/components/style/style_resolver.rs +++ b/components/style/style_resolver.rs @@ -439,8 +439,8 @@ where self.element, implemented_pseudo.as_ref(), self.element.style_attribute(), - self.element.get_smil_override(), - self.element.get_animation_rules(), + self.element.smil_override(), + self.element.animation_rules(), self.rule_inclusion, &mut applicable_declarations, &mut matching_context,