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

Clean up ForThrottledAnimationFlush stuff.

Browse source 
MozReview-Commit-ID: I6xeHv65nH2
This commit is contained in:
Bobby Holley 2017-07-26 10:00:28 -07:00
parent ce295f6daf
commit 543bbb7b9c
2 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/traversal_flags.rs
View file

@ -22,8 +22,6 @@ bitflags! {
const ForReconstruct = 1 << 3, const ForReconstruct = 1 << 3,
/// FIXME(bholley): This will go away. /// FIXME(bholley): This will go away.
const ForNewlyBoundElement = 1 << 4, const ForNewlyBoundElement = 1 << 4,
/// FIXME(bholley): This will go away.
const ForThrottledAnimationFlush = 1 << 5,
} }
} }
@ -52,7 +50,6 @@ pub fn assert_traversal_flags_match() {
ServoTraversalFlags_UnstyledChildrenOnly => UnstyledChildrenOnly, ServoTraversalFlags_UnstyledChildrenOnly => UnstyledChildrenOnly,
ServoTraversalFlags_ForReconstruct => ForReconstruct, ServoTraversalFlags_ForReconstruct => ForReconstruct,
ServoTraversalFlags_ForNewlyBoundElement => ForNewlyBoundElement, ServoTraversalFlags_ForNewlyBoundElement => ForNewlyBoundElement,
ServoTraversalFlags_ForThrottledAnimationFlush => ForThrottledAnimationFlush,
} }
} }

13
ports/geckolib/glue.rs
View file

@ -281,7 +281,7 @@ pub extern "C" fn Servo_TraverseSubtree(root: RawGeckoElementBorrowed,
} }
} }
if traversal_flags.contains(traversal_flags::ForThrottledAnimationFlush) { if traversal_flags.for_animation_only() {
return element.has_animation_only_dirty_descendants() || return element.has_animation_only_dirty_descendants() ||
element.borrow_data().unwrap().restyle.is_restyle(); element.borrow_data().unwrap().restyle.is_restyle();
} }
@ -2763,7 +2763,7 @@ pub extern "C" fn Servo_TakeChangeHint(element: RawGeckoElementBorrowed,
*was_restyled = data.restyle.is_restyle(); *was_restyled = data.restyle.is_restyle();
let damage = data.restyle.damage; let damage = data.restyle.damage;
if flags.contains(traversal_flags::ForThrottledAnimationFlush) { if flags.for_animation_only() {
if !*was_restyled { if !*was_restyled {
// Don't touch elements if the element was not restyled // Don't touch elements if the element was not restyled
// in throttled animation flush. // in throttled animation flush.
@ -2811,14 +2811,7 @@ pub extern "C" fn Servo_ResolveStyle(element: RawGeckoElementBorrowed,
assert!(data.has_styles(), "Resolving style on unstyled element"); assert!(data.has_styles(), "Resolving style on unstyled element");
// In the case where we process for throttled animation, there remaings // In the case where we process for throttled animation, there remaings
// restyle hints other than animation hints. // restyle hints other than animation hints.
// debug_assert!(element.has_current_styles_for_traversal(&*data, flags),
// FIXME(bholley): Unify these flags.
let assert_flags = if flags.contains(traversal_flags::ForThrottledAnimationFlush) {
traversal_flags::AnimationOnly
} else {
TraversalFlags::empty()
};
debug_assert!(element.has_current_styles_for_traversal(&*data, assert_flags),
"Resolving style on {:?} without current styles: {:?}", element, data); "Resolving style on {:?} without current styles: {:?}", element, data);
data.styles.primary().clone().into() data.styles.primary().clone().into()
} }