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

Avoid recomputing inline_content_sizes() when not needed (#33806)

Browse source 
The result of `inline_content_sizes()` may depend on the block size of
the containing block, so we were always recomputing in case we got
a different block size.

However, if no content has a vertical percentage or stretches vertically,
then we don't need to recompute: the result will be the same anyways.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Oriol Brufau 2024-10-14 18:06:27 +02:00 • committed by GitHub
parent 821bed1d11
commit b9ed45942d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 257 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout_2020/table/construct.rs
View file

@ -137,7 +137,7 @@ impl Table {
IndependentFormattingContext::NonReplaced(NonReplacedFormattingContext {
base_fragment_info: (&anonymous_info).into(),
style: grid_and_wrapper_style,
content_sizes: None,
content_sizes_result: None,
contents: NonReplacedFormattingContextContents::Table(table),
})
}
@ -858,7 +858,7 @@ where
context: ArcRefCell::new(NonReplacedFormattingContext {
style: info.style.clone(),
base_fragment_info: info.into(),
content_sizes: None,
content_sizes_result: None,
contents,
}),
};

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

@ -38,7 +38,7 @@ use crate::geom::{
Size, SizeKeyword, ToLogical, ToLogicalWithContainingBlock,
};
use crate::positioned::{relative_adjustement, PositioningContext, PositioningContextLength};
use crate::sizing::ContentSizes;
use crate::sizing::{ContentSizes, InlineContentSizesResult};
use crate::style_ext::{Clamp, ComputedValuesExt, PaddingBorderMargin};
use crate::table::TableSlotCoordinates;
use crate::{ContainingBlock, IndefiniteContainingBlock};
@ -298,10 +298,13 @@ impl<'a> TableLayout<'a> {
let mut inline_content_sizes = if is_in_fixed_mode {
ContentSizes::zero()
} else {
cell.contents.contents.inline_content_sizes(
layout_context,
&IndefiniteContainingBlock::new_for_style(&cell.style),
)
cell.contents
.contents
.inline_content_sizes(
layout_context,
&IndefiniteContainingBlock::new_for_style(&cell.style),
)
.sizes
};
inline_content_sizes.min_content += padding_border_sums.inline;
inline_content_sizes.max_content += padding_border_sums.inline;
@ -784,6 +787,7 @@ impl<'a> TableLayout<'a> {
&LogicalVec2::zero(),
false, /* auto_block_size_stretches_to_containing_block */
)
.sizes
.min_content
})
.max()
@ -2611,7 +2615,7 @@ impl Table {
&mut self,
layout_context: &LayoutContext,
containing_block_for_children: &IndefiniteContainingBlock,
) -> ContentSizes {
) -> InlineContentSizesResult {
let writing_mode = containing_block_for_children.style.writing_mode;
let mut layout = TableLayout::new(self);
let mut table_content_sizes = layout.compute_grid_min_max(layout_context, writing_mode);
@ -2638,7 +2642,10 @@ impl Table {
.max_assign(caption_minimum_inline_size);
}
table_content_sizes
InlineContentSizesResult {
sizes: table_content_sizes,
depends_on_block_constraints: false,
}
}
fn get_column_measure_for_column_at_index(