An element establishing a formatting context *is* the containing bloc…

…k for its contents
servo · Jun 22, 2020 · 080f5bb · 080f5bb
1 parent 3889f69
commit 080f5bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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(),
         }
     }