Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-15 19:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "layout: Add incremental box tree construction for inline floats and abspos" (#37888)

Browse source 
This reverts commit 19ceccc8eb due to a
significant increase in resident memory usage (See
https://github.com/servo/servo/issues/37887).

Testing: This is a revert due to a regression

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-07-05 11:45:58 +08:00 • committed by GitHub
parent e1a891ea96
commit c65cd1eadd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/layout/flow/construct.rs
View file

@ -604,17 +604,13 @@ impl<'dom> BlockContainerBuilder<'dom, '_> {
) {
if let Some(builder) = self.inline_formatting_context_builder.as_mut() {
if !builder.is_empty() {
let constructor = || {
ArcRefCell::new(AbsolutelyPositionedBox::construct(
let inline_level_box =
builder.push_absolutely_positioned_box(AbsolutelyPositionedBox::construct(
self.context,
info,
display_inside,
contents,
))
};
let old_layout_box = box_slot.take_layout_box_if_undamaged(info.damage);
let inline_level_box =
builder.push_absolutely_positioned_box(constructor, old_layout_box);
));
box_slot.set(LayoutBox::InlineLevel(vec![inline_level_box]));
return;
}
@ -641,17 +637,13 @@ impl<'dom> BlockContainerBuilder<'dom, '_> {
) {
if let Some(builder) = self.inline_formatting_context_builder.as_mut() {
if !builder.is_empty() {
let constructor = || {
ArcRefCell::new(FloatBox::construct(
self.context,
info,
display_inside,
contents,
self.propagated_data,
))
};
let old_layout_box = box_slot.take_layout_box_if_undamaged(info.damage);
let inline_level_box = builder.push_float_box(constructor, old_layout_box);
let inline_level_box = builder.push_float_box(FloatBox::construct(
self.context,
info,
display_inside,
contents,
self.propagated_data,
));
box_slot.set(LayoutBox::InlineLevel(vec![inline_level_box]));
return;
}

52
components/layout/flow/inline/construct.rs
View file

@ -160,10 +160,19 @@ impl InlineFormattingContextBuilder {
) -> ArcRefCell<InlineItem> {
// If there is an existing undamaged layout box that's compatible, use that.
let independent_formatting_context = old_layout_box
.and_then(LayoutBox::unsplit_inline_level_layout_box)
.and_then(|inline_item| match &*inline_item.borrow() {
InlineItem::Atomic(atomic, ..) => Some(atomic.clone()),
_ => None,
.and_then(|layout_box| {
let LayoutBox::InlineLevel(inline_level_boxes) = layout_box else {
return None;
};
// If there's an existing box, it should be a compatible atomic inline and should
// not have been subject to inline-block splitting.
assert_eq!(inline_level_boxes.len(), 1);
let first_box = inline_level_boxes.into_iter().next()?;
match &*first_box.borrow() {
InlineItem::Atomic(atomic, ..) => Some(atomic.clone()),
_ => None,
}
})
.unwrap_or_else(independent_formatting_context_creator);
@ -186,20 +195,9 @@ impl InlineFormattingContextBuilder {
pub(crate) fn push_absolutely_positioned_box(
&mut self,
absolutely_positioned_box_creator: impl FnOnce() -> ArcRefCell<AbsolutelyPositionedBox>,
old_layout_box: Option<LayoutBox>,
absolutely_positioned_box: AbsolutelyPositionedBox,
) -> ArcRefCell<InlineItem> {
let absolutely_positioned_box = old_layout_box
.and_then(LayoutBox::unsplit_inline_level_layout_box)
.and_then(|inline_item| match &*inline_item.borrow() {
InlineItem::OutOfFlowAbsolutelyPositionedBox(positioned_box, ..) => {
Some(positioned_box.clone())
},
_ => None,
})
.unwrap_or_else(absolutely_positioned_box_creator);
// We cannot just reuse the old inline item, because the `current_text_offset` may have changed.
let absolutely_positioned_box = ArcRefCell::new(absolutely_positioned_box);
let inline_level_box = ArcRefCell::new(InlineItem::OutOfFlowAbsolutelyPositionedBox(
absolutely_positioned_box,
self.current_text_offset,
@ -209,23 +207,9 @@ impl InlineFormattingContextBuilder {
inline_level_box
}
pub(crate) fn push_float_box(
&mut self,
float_box_creator: impl FnOnce() -> ArcRefCell<FloatBox>,
old_layout_box: Option<LayoutBox>,
) -> ArcRefCell<InlineItem> {
let inline_level_box = old_layout_box
.and_then(LayoutBox::unsplit_inline_level_layout_box)
.unwrap_or_else(|| ArcRefCell::new(InlineItem::OutOfFlowFloatBox(float_box_creator())));
debug_assert!(
matches!(
&*inline_level_box.borrow(),
InlineItem::OutOfFlowFloatBox(..),
),
"Created float box with incompatible `old_layout_box`"
);
pub(crate) fn push_float_box(&mut self, float_box: FloatBox) -> ArcRefCell<InlineItem> {
let inline_level_box =
ArcRefCell::new(InlineItem::OutOfFlowFloatBox(ArcRefCell::new(float_box)));
self.inline_items.push(inline_level_box.clone());
self.contains_floats = true;
inline_level_box