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

style: Update animations if the logical to physical property mapping changes.

Browse source 
Bug: 1309752
Reviewed-by: birtles
MozReview-Commit-ID: 1lbOcniojVO
This commit is contained in:
Emilio Cobos Álvarez 2018-07-08 16:14:21 +02:00
parent 5504cbdfd7
commit 856e5d1db6
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/style/matching.rs
View file

@ -233,18 +233,23 @@ trait PrivateMatchMethods: TElement {
fn needs_animations_update( fn needs_animations_update(
&self, &self,
context: &mut StyleContext<Self>, context: &mut StyleContext<Self>,
old_values: Option<&ComputedValues>, old_style: Option<&ComputedValues>,
new_values: &ComputedValues, new_style: &ComputedValues,
) -> bool { ) -> bool {
let new_box_style = new_values.get_box(); let new_box_style = new_style.get_box();
let has_new_animation_style = new_box_style.specifies_animations(); let new_style_specifies_animations = new_box_style.specifies_animations();
let old = match old_values { let old_style = match old_style {
Some(old) => old, Some(old) => old,
None => return has_new_animation_style, None => return new_style_specifies_animations,
}; };
let old_box_style = old.get_box(); let has_animations = self.has_css_animations();
if !new_style_specifies_animations && !has_animations {
return false;
}
let old_box_style = old_style.get_box();
let keyframes_could_have_changed = context let keyframes_could_have_changed = context
.shared .shared
@ -258,7 +263,7 @@ trait PrivateMatchMethods: TElement {
// //
// TODO: We should check which @keyframes were added/changed/deleted and // TODO: We should check which @keyframes were added/changed/deleted and
// update only animations corresponding to those @keyframes. // update only animations corresponding to those @keyframes.
if keyframes_could_have_changed && (has_new_animation_style || self.has_css_animations()) { if keyframes_could_have_changed {
return true; return true;
} }
@ -272,19 +277,27 @@ trait PrivateMatchMethods: TElement {
// If we were display: none, we may need to trigger animations. // If we were display: none, we may need to trigger animations.
if old_display == Display::None && new_display != Display::None { if old_display == Display::None && new_display != Display::None {
return has_new_animation_style; return new_style_specifies_animations;
} }
// If we are becoming display: none, we may need to stop animations. // If we are becoming display: none, we may need to stop animations.
if old_display != Display::None && new_display == Display::None { if old_display != Display::None && new_display == Display::None {
return self.has_css_animations(); return has_animations;
}
// We might need to update animations if writing-mode or direction
// changed, and any of the animations contained logical properties.
//
// We may want to be more granular, but it's probably not worth it.
if new_style.writing_mode != old_style.writing_mode {
return has_animations;
} }
false false
} }
/// Create a SequentialTask for resolving descendants in a SMIL display property /// Create a SequentialTask for resolving descendants in a SMIL display
/// animation if the display property changed from none. /// property animation if the display property changed from none.
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
fn handle_display_change_for_smil_if_needed( fn handle_display_change_for_smil_if_needed(
&self, &self,