This commit is contained in:
Hiroyuki Ikezoe 2017-06-30 22:44:32 -07:00
parent 2c369815c4
commit 4331112846

View file

@ -1309,8 +1309,6 @@ impl<'le> TElement for GeckoElement<'le> {
existing_transitions: &HashMap<TransitionProperty, existing_transitions: &HashMap<TransitionProperty,
Arc<AnimationValue>>) Arc<AnimationValue>>)
-> bool { -> bool {
use properties::animated_properties::AnimatedProperty;
// |property| should be an animatable longhand // |property| should be an animatable longhand
let animatable_longhand = AnimatableLonghand::from_transition_property(property).unwrap(); let animatable_longhand = AnimatableLonghand::from_transition_property(property).unwrap();
@ -1324,10 +1322,12 @@ impl<'le> TElement for GeckoElement<'le> {
return existing_transitions.get(property).unwrap() != &after_value; return existing_transitions.get(property).unwrap() != &after_value;
} }
combined_duration > 0.0f32 && let from = AnimationValue::from_computed_values(&animatable_longhand,
AnimatedProperty::from_animatable_longhand(&animatable_longhand, before_change_style);
before_change_style, let to = AnimationValue::from_computed_values(&animatable_longhand,
after_change_style).does_animate() after_change_style);
combined_duration > 0.0f32 && from != to
} }
#[inline] #[inline]