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

Bug 1357357 - Make the parser of transition-property match the spec.

Browse source 
1. We add a new arm to TransitionProperty, TransitionProperty::Unsupported,
   which contains an Atom, so it's better to remove the Copy trait from
   TransitionProperty.
2. TransitionProperty::Unsupported(Atom) represents any non-animatable, custom,
   or unrecognized property, and we use Atom to store the ident string for
   serialization.
This commit is contained in:
Boris Chiou 2017-04-24 13:22:25 +08:00
parent e5762cb695
commit 02fc1789e8
13 changed files with 139 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/style/gecko/wrapper.rs
View file

@ -811,7 +811,7 @@ impl<'le> TElement for GeckoElement<'le> {
continue;
}
let mut property_check_helper = |property: TransitionProperty| -> bool {
let mut property_check_helper = |property: &TransitionProperty| -> bool {
if self.needs_transitions_update_per_property(property,
combined_duration,
before_change_style,
@ -821,7 +821,9 @@ impl<'le> TElement for GeckoElement<'le> {
}
if let Some(set) = transitions_to_keep.as_mut() {
set.insert(property);
// The TransitionProperty here must be animatable, so cloning it is cheap
// because it is an integer-like enum.
set.insert(property.clone());
}
false
};
@ -835,12 +837,12 @@ impl<'le> TElement for GeckoElement<'le> {
});
if is_shorthand {
let shorthand: TransitionProperty = property.into();
if shorthand.longhands().iter().any(|&p| property_check_helper(p)) {
if shorthand.longhands().iter().any(|p| property_check_helper(p)) {
return true;
}
} else {
if animated_properties::nscsspropertyid_is_animatable(property) &&
property_check_helper(property.into()) {
property_check_helper(&property.into()) {
return true;
}
}
@ -855,7 +857,7 @@ impl<'le> TElement for GeckoElement<'le> {
}
fn needs_transitions_update_per_property(&self,
property: TransitionProperty,
property: &TransitionProperty,
combined_duration: f32,
before_change_style: &Arc<ComputedValues>,
after_change_style: &Arc<ComputedValues>,
@ -869,17 +871,17 @@ impl<'le> TElement for GeckoElement<'le> {
return false;
}
if existing_transitions.contains_key(&property) {
if existing_transitions.contains_key(property) {
// If there is an existing transition, update only if the end value differs.
// If the end value has not changed, we should leave the currently running
// transition as-is since we don't want to interrupt its timing function.
let after_value =
Arc::new(AnimationValue::from_computed_values(&property, after_change_style));
return existing_transitions.get(&property).unwrap() != &after_value;
Arc::new(AnimationValue::from_computed_values(property, after_change_style));
return existing_transitions.get(property).unwrap() != &after_value;
}
combined_duration > 0.0f32 &&
AnimatedProperty::from_transition_property(&property,
AnimatedProperty::from_transition_property(property,
before_change_style,
after_change_style).does_animate()
}