Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +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

11
components/style/dom.rs
View file

@ -15,7 +15,7 @@ use crate::data::ElementData;
use crate::element_state::ElementState;
use crate::font_metrics::FontMetricsProvider;
use crate::media_queries::Device;
use crate::properties::{AnimationRules, ComputedValues, PropertyDeclarationBlock};
use crate::properties::{AnimationDeclarations, ComputedValues, PropertyDeclarationBlock};
use crate::selector_parser::{AttrValue, Lang, PseudoElement, SelectorImpl};
use crate::shared_lock::{Locked, SharedRwLock};
use crate::stylist::CascadeData;
@ -479,12 +479,15 @@ pub trait TElement:
/// Get the combined animation and transition rules.
///
/// FIXME(emilio): Is this really useful?
fn animation_rules(&self, context: &SharedStyleContext) -> AnimationRules {
fn animation_declarations(&self, context: &SharedStyleContext) -> AnimationDeclarations {
if !self.may_have_animations() {
return AnimationRules(None, None);
return Default::default();
}
AnimationRules(self.animation_rule(context), self.transition_rule(context))
AnimationDeclarations {
animations: self.animation_rule(context),
transitions: self.transition_rule(context),
}
}
/// Get this element's animation rule.