Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17592 - hiikezoe:remove-animated-property, r=birtles

Browse source 
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
This commit is contained in:
bors-servo 2017-07-02 23:24:38 -07:00 • committed by GitHub
commit 990c4091fe
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/gecko/wrapper.rs
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]