style: Remove the get_ prefix from get_smil_override, and other animation stuff.

This commit is contained in:
Emilio Cobos Álvarez 2018-02-24 21:06:53 +01:00
parent c5bfc81b74
commit 607cf5aa3c
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 15 additions and 22 deletions

View file

@ -438,31 +438,28 @@ pub trait TElement
}
/// Get this element's SMIL override declarations.
fn get_smil_override(&self) -> Option<ArcBorrow<Locked<PropertyDeclarationBlock>>> {
fn smil_override(&self) -> Option<ArcBorrow<Locked<PropertyDeclarationBlock>>> {
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<Arc<Locked<PropertyDeclarationBlock>>> {
fn animation_rule(&self) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
None
}
/// Get this element's transition rule.
fn get_transition_rule(&self)
-> Option<Arc<Locked<PropertyDeclarationBlock>>> {
fn transition_rule(&self) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
None
}

View file

@ -1060,7 +1060,7 @@ impl<'le> TElement for GeckoElement<'le> {
unsafe { Gecko_UnsetDirtyStyleAttr(self.0) };
}
fn get_smil_override(&self) -> Option<ArcBorrow<Locked<PropertyDeclarationBlock>>> {
fn smil_override(&self) -> Option<ArcBorrow<Locked<PropertyDeclarationBlock>>> {
unsafe {
let slots = self.get_extended_slots()?;
@ -1084,15 +1084,11 @@ impl<'le> TElement for GeckoElement<'le> {
}
}
fn get_animation_rule(
&self,
) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
fn animation_rule(&self) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
get_animation_rule(self, CascadeLevel::Animations)
}
fn get_transition_rule(
&self,
) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
fn transition_rule(&self) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
get_animation_rule(self, CascadeLevel::Transitions)
}

View file

@ -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,
);
}

View file

@ -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,