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

Remove the containing_block parameter from TableLayout::layout_caption (#34297)

Browse source 
It was only used for the style, but the containing block of the caption
is the table wrapper box, whose style is stored in `self.table.style`.

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2024-11-20 17:24:00 +01:00 • committed by GitHub
parent 4451a59f88
commit 138ec6d0ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1609,7 +1609,6 @@ impl<'a> TableLayout<'a> {
caption: &TableCaption, caption: &TableCaption,
table_pbm: &PaddingBorderMargin, table_pbm: &PaddingBorderMargin,
layout_context: &LayoutContext, layout_context: &LayoutContext,
containing_block: &ContainingBlock,
parent_positioning_context: &mut PositioningContext, parent_positioning_context: &mut PositioningContext,
) -> BoxFragment { ) -> BoxFragment {
let context = caption.context.borrow(); let context = caption.context.borrow();
@ -1617,7 +1616,7 @@ impl<'a> TableLayout<'a> {
let containing_block = &ContainingBlock { let containing_block = &ContainingBlock {
inline_size: self.table_width + table_pbm.padding_border_sums.inline, inline_size: self.table_width + table_pbm.padding_border_sums.inline,
block_size: AuOrAuto::Auto, block_size: AuOrAuto::Auto,
style: containing_block.style, style: &self.table.style,
}; };
let mut box_fragment = context.layout_in_flow_block_level( let mut box_fragment = context.layout_in_flow_block_level(
@ -1716,13 +1715,8 @@ impl<'a> TableLayout<'a> {
} }
let original_positioning_context_length = positioning_context.len(); let original_positioning_context_length = positioning_context.len();
let mut caption_fragment = self.layout_caption( let mut caption_fragment =
caption, self.layout_caption(caption, &table_pbm, layout_context, positioning_context);
&table_pbm,
layout_context,
containing_block_for_children,
positioning_context,
);
// The caption is not placed yet. Construct a rectangle for it in the adjusted containing block // The caption is not placed yet. Construct a rectangle for it in the adjusted containing block
// for the table children and only then convert the result to physical geometry. // for the table children and only then convert the result to physical geometry.
@ -1821,13 +1815,8 @@ impl<'a> TableLayout<'a> {
} }
let original_positioning_context_length = positioning_context.len(); let original_positioning_context_length = positioning_context.len();
let mut caption_fragment = self.layout_caption( let mut caption_fragment =
caption, self.layout_caption(caption, &table_pbm, layout_context, positioning_context);
&table_pbm,
layout_context,
containing_block_for_children,
positioning_context,
);
// The caption is not placed yet. Construct a rectangle for it in the adjusted containing block // The caption is not placed yet. Construct a rectangle for it in the adjusted containing block
// for the table children and only then convert the result to physical geometry. // for the table children and only then convert the result to physical geometry.