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

layout: Minor style cleanup.

Browse source
This commit is contained in:
Patrick Walton 2016-11-29 17:51:31 -08:00
parent 89dff2d77f
commit ca3d802f03
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/animation.rs
View file

@ -88,7 +88,8 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,
if let Animation::Transition(_, unsafe_node, _, ref frame, _) = running_animation { if let Animation::Transition(_, unsafe_node, _, ref frame, _) = running_animation {
script_chan.send(ConstellationControlMsg::TransitionEnd(unsafe_node, script_chan.send(ConstellationControlMsg::TransitionEnd(unsafe_node,
frame.property_animation.property_name(), frame.property_animation
.property_name(),
frame.duration)) frame.duration))
.unwrap(); .unwrap();
} }
@ -113,7 +114,7 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,
for new_running_animation in new_running_animations { for new_running_animation in new_running_animations {
running_animations.entry(*new_running_animation.node()) running_animations.entry(*new_running_animation.node())
.or_insert_with(Vec::new) .or_insert_with(Vec::new)
.push(new_running_animation); .push(new_running_animation)
} }
let animation_state = if running_animations.is_empty() { let animation_state = if running_animations.is_empty() {
@ -122,7 +123,8 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,
AnimationState::AnimationsPresent AnimationState::AnimationsPresent
}; };
constellation_chan.send(ConstellationMsg::ChangeRunningAnimationsState(pipeline_id, animation_state)) constellation_chan.send(ConstellationMsg::ChangeRunningAnimationsState(pipeline_id,
animation_state))
.unwrap(); .unwrap();
} }

4
components/style/animation.rs
View file

@ -359,7 +359,9 @@ pub fn start_transitions_if_applicable(new_animations_sender: &Sender<Animation>
let mut had_animations = false; let mut had_animations = false;
for i in 0..new_style.get_box().transition_property_count() { for i in 0..new_style.get_box().transition_property_count() {
// Create any property animations, if applicable. // Create any property animations, if applicable.
let property_animations = PropertyAnimation::from_transition(i, old_style, Arc::make_mut(new_style)); let property_animations = PropertyAnimation::from_transition(i,
old_style,
Arc::make_mut(new_style));
for property_animation in property_animations { for property_animation in property_animations {
// Per [1], don't trigger a new transition if the end state for that transition is // Per [1], don't trigger a new transition if the end state for that transition is
// the same as that of a transition that's already running on the same node. // the same as that of a transition that's already running on the same node.