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

style: Support a restyle hint that indicates all descendants must be recascaded.

Browse source 
This also moves the result of deciding whether to recascade from the
RestyleData into the RestyleHint.
This commit is contained in:
Cameron McCormack 2017-05-30 09:14:23 +08:00
parent 085743560c
commit d0d43707fb
3 changed files with 120 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/style/data.rs
View file

@ -367,6 +367,11 @@ impl StoredRestyleHint {
StoredRestyleHint(RestyleHint::subtree_and_later_siblings())
}
/// Creates a restyle hint that indicates the element must be recascaded.
pub fn recascade_self() -> Self {
StoredRestyleHint(RestyleHint::recascade_self())
}
/// Returns true if the hint indicates that our style may be invalidated.
pub fn has_self_invalidations(&self) -> bool {
self.0.affects_self()
@ -402,6 +407,12 @@ impl StoredRestyleHint {
pub fn has_animation_hint(&self) -> bool {
self.0.has_animation_hint()
}
/// Returns true if the hint indicates the current element must be
/// recascaded.
pub fn has_recascade_self(&self) -> bool {
self.0.has_recascade_self()
}
}
impl Default for StoredRestyleHint {
@ -425,10 +436,6 @@ pub struct RestyleData {
/// for this element, its children, and its descendants.
pub hint: StoredRestyleHint,
/// Whether we need to recascade.
/// FIXME(bholley): This should eventually become more fine-grained.
pub recascade: bool,
/// The restyle damage, indicating what kind of layout changes are required
/// afte restyling.
pub damage: RestyleDamage,
@ -447,7 +454,7 @@ pub struct RestyleData {
impl RestyleData {
/// Returns true if this RestyleData might invalidate the current style.
pub fn has_invalidations(&self) -> bool {
self.hint.has_self_invalidations() || self.recascade
self.hint.has_self_invalidations()
}
/// Returns true if this RestyleData might invalidate sibling styles.
@ -598,12 +605,11 @@ impl ElementData {
return RestyleKind::MatchAndCascade;
}
if !hint.is_empty() {
if hint.has_replacements() {
return RestyleKind::CascadeWithReplacements(hint.replacements);
}
debug_assert!(restyle_data.recascade,
"We definitely need to do something!");
debug_assert!(hint.has_recascade_self(), "We definitely need to do something!");
return RestyleKind::CascadeOnly;
}