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

Fix positioning of statically positioned absolute child of inline box

Browse source
This commit is contained in:
Martin Robinson 2023-06-19 18:51:00 +02:00
parent befb472c9d
commit 0ced74cde3
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
5 changed files with 63 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -659,13 +659,20 @@ fn layout_atomic(
containing_block_for_children.style.writing_mode,
"Mixed writing modes are not supported yet"
);
// FIXME: Do we need to adjust the static position of the hoisted fragments in the positioning
// context somewhere near here?
let collects_for_nearest_positioned_ancestor = ifc
.positioning_context
.collects_for_nearest_positioned_ancestor();
let mut child_positioning_context =
PositioningContext::new_for_subtree(collects_for_nearest_positioned_ancestor);
let independent_layout = non_replaced.layout(
layout_context,
ifc.positioning_context,
&mut child_positioning_context,
&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
let tentative_block_size = box_size
@ -685,6 +692,7 @@ fn layout_atomic(
inline: inline_size,
},
};
BoxFragment::new(
non_replaced.base_fragment_info,
non_replaced.style.clone(),

17
components/layout_2020/positioned.rs
View file

@ -166,20 +166,27 @@ impl PositioningContext {
&mut self,
parent_fragment: &Fragment,
) {
let fragment_rect = match &parent_fragment {
Fragment::Box(b) | Fragment::Float(b) => &b.content_rect,
let start_offset = match &parent_fragment {
Fragment::Box(b) | Fragment::Float(b) => &b.content_rect.start_corner,
Fragment::AbsoluteOrFixedPositioned(_) => return,
Fragment::Anonymous(a) => &a.rect,
Fragment::Anonymous(a) => &a.rect.start_corner,
_ => unreachable!(),
};
self.adjust_static_position_of_hoisted_fragments_with_offset(start_offset);
}
/// See documentation for [adjust_static_position_of_hoisted_fragments].
pub(crate) fn adjust_static_position_of_hoisted_fragments_with_offset(
&mut self,
start_offset: &Vec2<CSSPixelLength>,
) {
let update_fragment_if_needed = |hoisted_fragment: &mut HoistedAbsolutelyPositionedBox| {
let mut fragment = hoisted_fragment.fragment.borrow_mut();
if let AbsoluteBoxOffsets::StaticStart { start } = &mut fragment.box_offsets.inline {
*start += fragment_rect.start_corner.inline;
*start += start_offset.inline;
}
if let AbsoluteBoxOffsets::StaticStart { start } = &mut fragment.box_offsets.block {
*start += fragment_rect.start_corner.block;
*start += start_offset.block;
}
};