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

layout: Make Fragment hold ArcRefCell inside (#34923)

Browse source 
Push the interior mutability into enum variants of `Fragment`, so that
they can be cloned. This saves memory in the `Fragment` tree as the
`Fragment` enum is now a relatively wee 16 bytes and the interior parts
can be a variety of sizes. Before, every `Fragment` was the size of the
biggest kind (`BoxFragment` - 248 bytes).

This a step on the way toward incremental layout.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Martin Robinson 2025-01-13 10:59:59 +01:00 • committed by GitHub
parent c936dd6c4e
commit de780dcde4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 257 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/layout_2020/table/layout.rs
View file

@ -24,7 +24,9 @@ use style::values::generics::box_::{GenericVerticalAlign as VerticalAlign, Verti
use style::values::generics::length::GenericLengthPercentageOrAuto::{Auto, LengthPercentage};
use style::Zero;
use super::{Table, TableCaption, TableSlot, TableSlotCell, TableTrack, TableTrackGroup};
use super::{
ArcRefCell, Table, TableCaption, TableSlot, TableSlotCell, TableTrack, TableTrackGroup,
};
use crate::context::LayoutContext;
use crate::formatting_contexts::{Baselines, IndependentLayout};
use crate::fragment_tree::{
@ -1740,7 +1742,7 @@ impl<'a> TableLayout<'a> {
.to_logical(table_writing_mode)
.block;
let caption_fragment = Fragment::Box(caption_fragment);
let caption_fragment = Fragment::Box(ArcRefCell::new(caption_fragment));
positioning_context.adjust_static_position_of_hoisted_fragments(
&caption_fragment,
original_positioning_context_length,
@ -1790,7 +1792,7 @@ impl<'a> TableLayout<'a> {
.block;
table_layout.content_inline_size_for_table = Some(logical_grid_content_rect.size.inline);
let grid_fragment = Fragment::Box(grid_fragment);
let grid_fragment = Fragment::Box(ArcRefCell::new(grid_fragment));
positioning_context.adjust_static_position_of_hoisted_fragments(
&grid_fragment,
original_positioning_context_length,
@ -1831,7 +1833,7 @@ impl<'a> TableLayout<'a> {
.to_logical(table_writing_mode)
.block;
let caption_fragment = Fragment::Box(caption_fragment);
let caption_fragment = Fragment::Box(ArcRefCell::new(caption_fragment));
positioning_context.adjust_static_position_of_hoisted_fragments(
&caption_fragment,
original_positioning_context_length,
@ -2182,7 +2184,9 @@ impl<'a> TableLayout<'a> {
rect,
})
}
row_fragment_layout.fragments.push(Fragment::Box(fragment));
row_fragment_layout
.fragments
.push(Fragment::Box(ArcRefCell::new(fragment)));
}
fn make_fragments_for_columns_and_column_groups(
@ -2345,7 +2349,7 @@ impl<'a> RowFragmentLayout<'a> {
containing_block_for_logical_conversion: &ContainingBlock,
containing_block_for_children: &ContainingBlock,
row_group_fragment_layout: &mut Option<RowGroupFragmentLayout>,
) -> BoxFragment {
) -> ArcRefCell<BoxFragment> {
if self.positioning_context.is_some() {
self.rect.start_corner +=
relative_adjustement(&self.row.style, containing_block_for_children);
@ -2396,7 +2400,7 @@ impl<'a> RowFragmentLayout<'a> {
positioning_context.append(row_positioning_context);
}
row_fragment
ArcRefCell::new(row_fragment)
}
}
@ -2432,7 +2436,7 @@ impl RowGroupFragmentLayout {
table_positioning_context: &mut PositioningContext,
containing_block_for_logical_conversion: &ContainingBlock,
containing_block_for_children: &ContainingBlock,
) -> BoxFragment {
) -> ArcRefCell<BoxFragment> {
if self.positioning_context.is_some() {
self.rect.start_corner +=
relative_adjustement(&self.style, containing_block_for_children);
@ -2458,7 +2462,7 @@ impl RowGroupFragmentLayout {
table_positioning_context.append(row_positioning_context);
}
row_group_fragment
ArcRefCell::new(row_group_fragment)
}
}