Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename outer_inline* outside of sizing.rs to outer_inline_content_sizes*

Browse source
This commit is contained in:
Simon Sapin 2020-06-19 15:27:33 +02:00
parent 235df94f2e
commit 51c388fe1c
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout_2020/flow/inline.rs
View file

@ -200,7 +200,7 @@ impl InlineFormattingContext {
} }
}, },
InlineLevelBox::Atomic(atomic) => { 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.layout_context,
self.containing_block_writing_mode, self.containing_block_writing_mode,
); );

5
components/layout_2020/flow/mod.rs
View file

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

10
components/layout_2020/formatting_contexts.rs
View file

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