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: Simplify Table::compute_inline_content_sizes (#35290)

Browse source 
Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-02-05 18:31:58 +01:00 • committed by GitHub
parent 3fe32cc059
commit eb0382449f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2701,32 +2701,19 @@ impl ComputeInlineContentSizes for Table {
Au::zero(),
);
layout.compute_measures(layout_context, writing_mode);
let mut table_content_sizes = layout.compute_grid_min_max();
let mut caption_minimum_inline_size =
layout.compute_caption_minimum_inline_size(layout_context);
if caption_minimum_inline_size > table_content_sizes.min_content ||
caption_minimum_inline_size > table_content_sizes.max_content
{
// Padding and border should apply to the table grid, but they will be taken into
// account when computing the inline content sizes of the table wrapper (our parent), so
// this code removes their contribution from the inline content size of the caption.
let layout_style = self.layout_style(Some(&layout));
let padding = layout_style
.padding(writing_mode)
.percentages_relative_to(Au::zero());
let border = layout_style.border_width(writing_mode);
caption_minimum_inline_size -= padding.inline_sum() + border.inline_sum();
table_content_sizes
.min_content
.max_assign(caption_minimum_inline_size);
table_content_sizes
.max_content
.max_assign(caption_minimum_inline_size);
}
let grid_content_sizes = layout.compute_grid_min_max();
// Padding and border should apply to the table grid, but they will be taken into
// account when computing the inline content sizes of the table wrapper (our parent), so
// this code removes their contribution from the inline content size of the caption.
let caption_content_sizes = ContentSizes::from(
layout.compute_caption_minimum_inline_size(layout_context) -
layout.pbm.padding_border_sums.inline,
);
InlineContentSizesResult {
sizes: table_content_sizes,
sizes: grid_content_sizes.max(caption_content_sizes),
depends_on_block_constraints: false,
}
}