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

Make outer_inline and outer_inline_and_percentages free functions

Browse source 
They now take a closure that will compute the content sizes on demand.
This commit is contained in:
Anthony Ramine 2020-06-15 13:35:46 +02:00
parent d0a1066d2d
commit 07d8c28d4a
3 changed files with 97 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ use crate::positioned::{
relative_adjustement, AbsolutelyPositionedBox, HoistedAbsolutelyPositionedBox,
PositioningContext,
};
use crate::sizing::ContentSizes;
use crate::sizing::{self, ContentSizes};
use crate::style_ext::{ComputedValuesExt, Display, DisplayGeneratingBox, DisplayOutside};
use crate::ContainingBlock;
use app_units::Au;
@ -200,9 +200,10 @@ impl InlineFormattingContext {
}
},
InlineLevelBox::Atomic(atomic) => {
let (outer, pc) = atomic.content_sizes.outer_inline_and_percentages(
let (outer, pc) = sizing::outer_inline_and_percentages(
&atomic.style,
self.containing_block_writing_mode,
|| atomic.content_sizes.expect_inline().clone(),
);
self.current_line.min_content += outer.min_content;
self.current_line.max_content += outer.max_content;