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

layout_2020: Do line break for atomic inline-level elements

Browse source
This commit is contained in:
Pu Xingyu 2023-06-29 11:46:51 +08:00
parent 6303d652a9
commit c4a27f5208
1 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -623,16 +623,12 @@ fn layout_atomic(
let pbm = style.padding_border_margin(&ifc.containing_block); let pbm = style.padding_border_margin(&ifc.containing_block);
let margin = pbm.margin.auto_is(Length::zero); let margin = pbm.margin.auto_is(Length::zero);
let pbm_sums = &(&pbm.padding + &pbm.border) + &margin; let pbm_sums = &(&pbm.padding + &pbm.border) + &margin;
ifc.inline_position += pbm_sums.inline_start; let position = style.clone_position();
let mut start_corner = Vec2 {
block: pbm_sums.block_start,
inline: ifc.inline_position - ifc.current_nesting_level.inline_start,
};
if style.clone_position().is_relative() {
start_corner += &relative_adjustement(&style, ifc.containing_block)
}
let fragment = match atomic { let mut child_positioning_context = None;
// We need to know the inline size of the atomic before deciding whether to do the line break.
let mut fragment = match atomic {
IndependentFormattingContext::Replaced(replaced) => { IndependentFormattingContext::Replaced(replaced) => {
let size = replaced.contents.used_size_as_if_inline_element( let size = replaced.contents.used_size_as_if_inline_element(
ifc.containing_block, ifc.containing_block,
@ -643,7 +639,10 @@ fn layout_atomic(
let fragments = replaced let fragments = replaced
.contents .contents
.make_fragments(&replaced.style, size.clone()); .make_fragments(&replaced.style, size.clone());
let content_rect = Rect { start_corner, size }; let content_rect = Rect {
start_corner: Vec2::zero(),
size,
};
BoxFragment::new( BoxFragment::new(
replaced.base_fragment_info, replaced.base_fragment_info,
replaced.style.clone(), replaced.style.clone(),
@ -696,16 +695,14 @@ fn layout_atomic(
let collects_for_nearest_positioned_ancestor = ifc let collects_for_nearest_positioned_ancestor = ifc
.positioning_context .positioning_context
.collects_for_nearest_positioned_ancestor(); .collects_for_nearest_positioned_ancestor();
let mut child_positioning_context = child_positioning_context = Some(PositioningContext::new_for_subtree(
PositioningContext::new_for_subtree(collects_for_nearest_positioned_ancestor); collects_for_nearest_positioned_ancestor,
));
let independent_layout = non_replaced.layout( let independent_layout = non_replaced.layout(
layout_context, layout_context,
&mut child_positioning_context, child_positioning_context.as_mut().unwrap(),
&containing_block_for_children, &containing_block_for_children,
); );
child_positioning_context
.adjust_static_position_of_hoisted_fragments_with_offset(&start_corner);
ifc.positioning_context.append(child_positioning_context);
// https://drafts.csswg.org/css2/visudet.html#block-root-margin // https://drafts.csswg.org/css2/visudet.html#block-root-margin
let tentative_block_size = box_size let tentative_block_size = box_size
@ -719,7 +716,7 @@ fn layout_atomic(
.clamp_between_extremums(min_box_size.block, max_box_size.block); .clamp_between_extremums(min_box_size.block, max_box_size.block);
let content_rect = Rect { let content_rect = Rect {
start_corner, start_corner: Vec2::zero(),
size: Vec2 { size: Vec2 {
block: block_size, block: block_size,
inline: inline_size, inline: inline_size,
@ -740,6 +737,31 @@ fn layout_atomic(
}, },
}; };
if fragment.content_rect.size.inline + pbm_sums.inline_sum() >
ifc.containing_block.inline_size - ifc.inline_position &&
ifc.current_nesting_level.white_space.allow_wrap() &&
ifc.current_nesting_level.fragments_so_far.len() != 0
{
ifc.finish_line_and_reset(layout_context);
}
ifc.inline_position += pbm_sums.inline_start;
let mut start_corner = Vec2 {
block: pbm_sums.block_start,
inline: ifc.inline_position - ifc.current_nesting_level.inline_start,
};
if position.is_relative() {
start_corner += &relative_adjustement(atomic.style(), ifc.containing_block)
}
if let Some(mut child_positioning_context) = child_positioning_context.take() {
child_positioning_context
.adjust_static_position_of_hoisted_fragments_with_offset(&start_corner);
ifc.positioning_context.append(child_positioning_context);
}
fragment.content_rect.start_corner = start_corner;
ifc.inline_position += pbm_sums.inline_end + fragment.content_rect.size.inline; ifc.inline_position += pbm_sums.inline_end + fragment.content_rect.size.inline;
ifc.current_nesting_level ifc.current_nesting_level
.max_block_size_of_fragments_so_far .max_block_size_of_fragments_so_far