Rename outer_inline* outside of sizing.rs to outer_inline_content_sizes*

servo · Jun 19, 2020 · 51c388f · 51c388f
1 parent 235df94
commit 51c388f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs
@@ -200,7 +200,7 @@ impl InlineFormattingContext {
                             }
                         },
                         InlineLevelBox::Atomic(atomic) => {
-                            let (outer, pc) = atomic.outer_inline_and_percentages(
+                            let (outer, pc) = atomic.outer_inline_content_sizes_and_percentages(
                                 self.layout_context,
                                 self.containing_block_writing_mode,
                             );

diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
@@ -387,9 +387,8 @@ impl BlockLevelBox {
             } => sizing::outer_inline(style, containing_block_writing_mode, || {
                 contents.inline_content_sizes(layout_context, style.writing_mode)
             }),
-            Self::Independent(independent) => {
-                independent.outer_inline(layout_context, containing_block_writing_mode)
-            },
+            Self::Independent(independent) => independent
+                .outer_inline_content_sizes(layout_context, containing_block_writing_mode),
             BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => ContentSizes::zero(),
             BlockLevelBox::OutOfFlowFloatBox(_box_) => {
                 // TODO: Actually implement that.

diff --git a/components/layout_2020/formatting_contexts.rs b/components/layout_2020/formatting_contexts.rs
@@ -134,18 +134,20 @@ impl IndependentFormattingContext {
         }
     }
 
-    pub fn outer_inline(
+    pub fn outer_inline_content_sizes(
         &mut self,
         layout_context: &LayoutContext,
         containing_block_writing_mode: WritingMode,
     ) -> ContentSizes {
-        let (mut outer, percentages) =
-            self.outer_inline_and_percentages(layout_context, containing_block_writing_mode);
+        let (mut outer, percentages) = self.outer_inline_content_sizes_and_percentages(
+            layout_context,
+            containing_block_writing_mode,
+        );
         outer.adjust_for_pbm_percentages(percentages);
         outer
     }
 
-    pub fn outer_inline_and_percentages(
+    pub fn outer_inline_content_sizes_and_percentages(
         &mut self,
         layout_context: &LayoutContext,
         containing_block_writing_mode: WritingMode,