diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index de22f1a427d..9af17e0a4b1 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -138,18 +138,18 @@ impl BlockContainer { pub(super) fn inline_content_sizes( &self, layout_context: &LayoutContext, - containing_block_writing_mode: WritingMode, + writing_mode: WritingMode, ) -> ContentSizes { match &self { Self::BlockLevelBoxes(boxes) => boxes .par_iter() .map(|box_| { box_.borrow_mut() - .inline_content_sizes(layout_context, containing_block_writing_mode) + .inline_content_sizes(layout_context, writing_mode) }) .reduce(ContentSizes::zero, ContentSizes::max), Self::InlineFormattingContext(context) => { - context.inline_content_sizes(layout_context, containing_block_writing_mode) + context.inline_content_sizes(layout_context, writing_mode) }, } } diff --git a/components/layout_2020/formatting_contexts.rs b/components/layout_2020/formatting_contexts.rs index 0c3e8212d0c..4dcb38952c0 100644 --- a/components/layout_2020/formatting_contexts.rs +++ b/components/layout_2020/formatting_contexts.rs @@ -159,9 +159,7 @@ impl IndependentFormattingContext { let contents = &non_replaced.contents; sizing::outer_inline_and_percentages(&style, containing_block_writing_mode, || { content_sizes - .get_or_insert_with(|| { - contents.inline_content_sizes(layout_context, style.writing_mode) - }) + .get_or_insert_with(|| contents.inline_content_sizes(layout_context, style.writing_mode)) .clone() }) }, @@ -211,12 +209,12 @@ impl NonReplacedFormattingContextContents { pub fn inline_content_sizes( &self, layout_context: &LayoutContext, - containing_block_writing_mode: WritingMode, + writing_mode: WritingMode, ) -> ContentSizes { match self { Self::Flow(inner) => inner .contents - .inline_content_sizes(layout_context, containing_block_writing_mode), + .inline_content_sizes(layout_context, writing_mode), Self::Flex(inner) => inner.inline_content_sizes(), } }