diff options
Diffstat (limited to 'components/layout_2020/flow')
| -rw-r--r-- | components/layout_2020/flow/inline/mod.rs | 1 | ||||
| -rw-r--r-- | components/layout_2020/flow/mod.rs | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/components/layout_2020/flow/inline/mod.rs b/components/layout_2020/flow/inline/mod.rs index 88447a87e33..cc444cc3e7e 100644 --- a/components/layout_2020/flow/inline/mod.rs +++ b/components/layout_2020/flow/inline/mod.rs @@ -2389,6 +2389,7 @@ impl<'a> ContentSizesComputation<'a> { let outer = atomic.outer_inline_content_sizes( self.layout_context, self.containing_block_writing_mode, + Au::zero, ); if !inline_formatting_context diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index d6a647c62cb..81d043e4024 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -366,7 +366,7 @@ fn calculate_inline_content_size_for_block_level_boxes( BlockLevelBox::OutOfFlowFloatBox(ref mut float_box) => { let size = float_box .contents - .outer_inline_content_sizes(layout_context, writing_mode) + .outer_inline_content_sizes(layout_context, writing_mode, Au::zero) .max(ContentSizes::zero()); let style_box = &float_box.contents.style().get_box(); Some((size, style_box.float, style_box.clear)) @@ -374,9 +374,12 @@ fn calculate_inline_content_size_for_block_level_boxes( BlockLevelBox::SameFormattingContextBlock { style, contents, .. } => { - let size = sizing::outer_inline(style, writing_mode, || { - contents.inline_content_sizes(layout_context, style.writing_mode) - }) + let size = sizing::outer_inline( + style, + writing_mode, + || contents.inline_content_sizes(layout_context, style.writing_mode), + Au::zero, + ) .max(ContentSizes::zero()); // A block in the same BFC can overlap floats, it's not moved next to them, // so we shouldn't add its size to the size of the floats. @@ -385,7 +388,7 @@ fn calculate_inline_content_size_for_block_level_boxes( }, BlockLevelBox::Independent(ref mut independent) => { let size = independent - .outer_inline_content_sizes(layout_context, writing_mode) + .outer_inline_content_sizes(layout_context, writing_mode, Au::zero) .max(ContentSizes::zero()); Some((size, Float::None, independent.style().get_box().clear)) }, |