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

style: Don't calculate animations just on style changes.

Browse source 
Calculate it also on the first restyle.
This commit is contained in:
Emilio Cobos Álvarez 2016-06-25 15:46:55 +02:00
parent 8527762b83
commit f149d4d577
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/style/matching.rs
View file

@ -416,25 +416,26 @@ trait PrivateMatchMethods: TNode
}
};
// Trigger transitions if necessary. This will reset `this_style` back to its old value if
// it did trigger a transition.
if animate_properties {
let this_opaque = self.opaque();
// Trigger any present animations if necessary.
let mut animations_started = animation::maybe_start_animations::<<Self::ConcreteElement as Element>::Impl>(
&context,
this_opaque,
&this_style);
// Trigger transitions if necessary. This will reset `this_style` back
// to its old value if it did trigger a transition.
if let Some(ref style) = style {
let mut animations_started =
animations_started |=
animation::start_transitions_if_applicable::<Self::ConcreteComputedValues>(
&context.new_animations_sender,
self.opaque(),
this_opaque,
&**style,
&mut this_style);
// TODO: Take into account animation-play-state
animations_started |= animation::maybe_start_animations::<<Self::ConcreteElement as Element>::Impl>(
&context,
self.opaque(),
&mut this_style);
cacheable = cacheable && !animations_started
}
cacheable = cacheable && !animations_started
}
// Calculate style difference.