Skip to content

Commit

Permalink
Auto merge of #17592 - hiikezoe:remove-animated-property, r=birtles
Browse files Browse the repository at this point in the history
Don't use AnimatedProperty functions for gecko

<!-- Please describe your changes on the following line: -->
https://bugzilla.mozilla.org/show_bug.cgi?id=1377680

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
  • Loading branch information
bors-servo committed Jul 3, 2017
2 parents 2c36981 + 4331112 commit 990c409
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions components/style/gecko/wrapper.rs
Expand Up @@ -1309,8 +1309,6 @@ impl<'le> TElement for GeckoElement<'le> {
existing_transitions: &HashMap<TransitionProperty,
Arc<AnimationValue>>)
-> bool {
use properties::animated_properties::AnimatedProperty;

// |property| should be an animatable longhand
let animatable_longhand = AnimatableLonghand::from_transition_property(property).unwrap();

Expand All @@ -1324,10 +1322,12 @@ impl<'le> TElement for GeckoElement<'le> {
return existing_transitions.get(property).unwrap() != &after_value;
}

combined_duration > 0.0f32 &&
AnimatedProperty::from_animatable_longhand(&animatable_longhand,
before_change_style,
after_change_style).does_animate()
let from = AnimationValue::from_computed_values(&animatable_longhand,
before_change_style);
let to = AnimationValue::from_computed_values(&animatable_longhand,
after_change_style);

combined_duration > 0.0f32 && from != to
}

#[inline]
Expand Down

0 comments on commit 990c409

Please sign in to comment.