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

layout: Start using the new extensible RestyleDamage type from Stylo (#37592)

Browse source 
This will allow Servo to add custom types of damage in the near future
which correspond to minor phases layout. The damage exposed by Stylo
only corresponds to the major layout phses. In the future, both phases
will likely be managed by Servo itself and implementors will need to
provide their own damage system entirely.

Testing: This shouldn't change behavior and thus is covered by existing
tests.

Stylo PR: https://github.com/servo/stylo/pull/207

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Martin Robinson 2025-06-26 16:10:48 +02:00 • committed by GitHub
parent a9dc2ac83a
commit 5286869b96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 56 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/layout_impl.rs
View file

@ -840,8 +840,8 @@ impl LayoutThread {
let mut damage =
compute_damage_and_repair_style(layout_context.shared_context(), root_node);
if viewport_changed {
damage = RestyleDamage::REBUILD_BOX;
} else if !damage.contains(RestyleDamage::REBUILD_BOX) {
damage = RestyleDamage::RELAYOUT;
} else if !damage.contains(RestyleDamage::RELAYOUT) {
layout_context.style_context.stylist.rule_tree().maybe_gc();
return damage;
}

21
components/layout/traversal.rs
View file

@ -104,8 +104,7 @@ pub(crate) fn compute_damage_and_repair_style_inner(
node: ServoLayoutNode<'_>,
parent_restyle_damage: RestyleDamage,
) -> RestyleDamage {
let original_damage;
let damage;
let element_damage;
{
let mut element_data = node
@ -114,28 +113,28 @@ pub(crate) fn compute_damage_and_repair_style_inner(
.element_data
.borrow_mut();
original_damage = std::mem::take(&mut element_data.damage);
damage = original_damage | parent_restyle_damage;
element_damage = std::mem::take(&mut element_data.damage);
if let Some(ref style) = element_data.styles.primary {
if style.get_box().display == Display::None {
return damage;
return element_damage | parent_restyle_damage;
}
}
}
let mut propagated_damage = damage;
let element_and_parent_damage = element_damage | parent_restyle_damage;
let mut damage_from_children = RestyleDamage::empty();
for child in iter_child_nodes(node) {
if child.is_element() {
propagated_damage |= compute_damage_and_repair_style_inner(context, child, damage);
damage_from_children |=
compute_damage_and_repair_style_inner(context, child, element_and_parent_damage);
}
}
if !propagated_damage.contains(RestyleDamage::REBUILD_BOX) &&
!original_damage.contains(RestyleDamage::REBUILD_BOX)
{
let damage_for_parent = damage_from_children | element_and_parent_damage;
if !damage_for_parent.contains(RestyleDamage::RELAYOUT) && !element_damage.is_empty() {
node.repair_style(context);
}
propagated_damage
damage_for_parent
}