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

Bug 1341372 - Part 3: Factor out need_update_animations.

Browse source 
We will add another function, needs_update_transitions, to check if we need
to update transitions, so factor this out.

MozReview-Commit-ID: 5LYkyi4aDri
This commit is contained in:
Boris Chiou 2017-04-04 17:54:30 +08:00
parent b1476f1f81
commit 145e1b6bff
1 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
components/style/matching.rs
View file

@ -524,6 +524,31 @@ trait PrivateMatchMethods: TElement {
pseudo_style.is_some()) pseudo_style.is_some())
} }
#[cfg(feature = "gecko")]
fn needs_update_animations(&self,
old_values: &Option<Arc<ComputedValues>>,
new_values: &Arc<ComputedValues>,
pseudo: Option<&PseudoElement>) -> bool {
let ref new_box_style = new_values.get_box();
let has_new_animation_style = new_box_style.animation_name_count() >= 1 &&
new_box_style.animation_name_at(0).0.len() != 0;
let has_animations = self.has_css_animations(pseudo);
old_values.as_ref().map_or(has_new_animation_style, |ref old| {
let ref old_box_style = old.get_box();
let old_display_style = old_box_style.clone_display();
let new_display_style = new_box_style.clone_display();
// FIXME: Bug 1344581: We still need to compare keyframe rules.
!old_box_style.animations_equals(&new_box_style) ||
(old_display_style == display::T::none &&
new_display_style != display::T::none &&
has_new_animation_style) ||
(old_display_style != display::T::none &&
new_display_style == display::T::none &&
has_animations)
})
}
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
fn process_animations(&self, fn process_animations(&self,
context: &mut StyleContext<Self>, context: &mut StyleContext<Self>,
@ -533,27 +558,8 @@ trait PrivateMatchMethods: TElement {
use context::{CSS_ANIMATIONS, EFFECT_PROPERTIES}; use context::{CSS_ANIMATIONS, EFFECT_PROPERTIES};
use context::UpdateAnimationsTasks; use context::UpdateAnimationsTasks;
let ref new_box_style = new_values.get_box();
let has_new_animation_style = new_box_style.animation_name_count() >= 1 &&
new_box_style.animation_name_at(0).0.len() != 0;
let has_animations = self.has_css_animations(pseudo);
let mut tasks = UpdateAnimationsTasks::empty(); let mut tasks = UpdateAnimationsTasks::empty();
let needs_update_animations = if self.needs_update_animations(old_values, new_values, pseudo) {
old_values.as_ref().map_or(has_new_animation_style, |ref old| {
let ref old_box_style = old.get_box();
let old_display_style = old_box_style.clone_display();
let new_display_style = new_box_style.clone_display();
// FIXME: Bug 1344581: We still need to compare keyframe rules.
!old_box_style.animations_equals(&new_box_style) ||
(old_display_style == display::T::none &&
new_display_style != display::T::none &&
has_new_animation_style) ||
(old_display_style != display::T::none &&
new_display_style == display::T::none &&
has_animations)
});
if needs_update_animations {
tasks.insert(CSS_ANIMATIONS); tasks.insert(CSS_ANIMATIONS);
} }
if self.has_animations(pseudo) { if self.has_animations(pseudo) {