From 5da9f52b1ffd5b17a9fb8213a616287ffb427dca Mon Sep 17 00:00:00 2001 From: implicitfield <114500360+implicitfield@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:09:42 +0400 Subject: [PATCH] LibWeb: Use the parent container's y offset when finding static position Fixes #18819. --- .../abspos-box-with-block-level-sibling.txt | 14 ++++++++++++++ .../abspos-box-with-block-level-sibling.html | 16 ++++++++++++++++ .../LibWeb/Layout/BlockFormattingContext.cpp | 1 + .../LibWeb/Layout/FormattingContext.cpp | 5 +++-- Userland/Libraries/LibWeb/Layout/LayoutState.h | 3 +++ 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Tests/LibWeb/Layout/expected/abspos-box-with-block-level-sibling.txt create mode 100644 Tests/LibWeb/Layout/input/abspos-box-with-block-level-sibling.html diff --git a/Tests/LibWeb/Layout/expected/abspos-box-with-block-level-sibling.txt b/Tests/LibWeb/Layout/expected/abspos-box-with-block-level-sibling.txt new file mode 100644 index 0000000000..d83cca97b5 --- /dev/null +++ b/Tests/LibWeb/Layout/expected/abspos-box-with-block-level-sibling.txt @@ -0,0 +1,14 @@ +Viewport <#document> at (0,0) content-size 800x600 children: not-inline + BlockContainer at (5,5) content-size 790x236 [BFC] children: not-inline + BlockContainer at (18,18) content-size 764x210 children: not-inline + BlockContainer at (23,23) content-size 200x200 children: not-inline + BlockContainer at (23,233) content-size 100x200 positioned [BFC] children: not-inline + BlockContainer <(anonymous)> at (18,228) content-size 764x0 children: inline + TextNode <#text> + +ViewportPaintable (Viewport<#document>) [0,0 800x600] + PaintableWithLines (BlockContainer) [0,0 800x246] overflow: [5,5 790x433] + PaintableWithLines (BlockContainer) [13,13 774x220] overflow: [18,18 764x420] + PaintableWithLines (BlockContainer
.static) [18,18 210x210] + PaintableWithLines (BlockContainer
.absolute) [18,228 110x210] + PaintableWithLines (BlockContainer(anonymous)) [18,228 764x0] diff --git a/Tests/LibWeb/Layout/input/abspos-box-with-block-level-sibling.html b/Tests/LibWeb/Layout/input/abspos-box-with-block-level-sibling.html new file mode 100644 index 0000000000..e0dcd6035d --- /dev/null +++ b/Tests/LibWeb/Layout/input/abspos-box-with-block-level-sibling.html @@ -0,0 +1,16 @@ +
diff --git a/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp index d24a2dc8d7..3f7e7b6511 100644 --- a/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp @@ -585,6 +585,7 @@ void BlockFormattingContext::layout_block_level_box(Box const& box, BlockContain auto& box_state = m_state.get_mutable(box); if (box.is_absolutely_positioned()) { + box_state.vertical_offset_of_parent_block_container = m_y_offset_of_current_block_container.value(); m_absolutely_positioned_boxes.append(box); return; } diff --git a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp index 61b775d6aa..da1a95e1db 100644 --- a/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FormattingContext.cpp @@ -1204,9 +1204,10 @@ CSSPixelPoint FormattingContext::calculate_static_position(Box const& box) const // Easy case: no previous sibling, we're at the top of the containing block. } } else { - x = m_state.get(box).margin_left; + auto const& box_state = m_state.get(box); + x = box_state.margin_left; // We're among block siblings, Y can be calculated easily. - y = m_state.get(box).margin_top; + y = box_state.margin_top + box_state.vertical_offset_of_parent_block_container; } auto offset_to_static_parent = content_box_rect_in_static_position_ancestor_coordinate_space(box, *box.containing_block()); return offset_to_static_parent.location().translated(x, y); diff --git a/Userland/Libraries/LibWeb/Layout/LayoutState.h b/Userland/Libraries/LibWeb/Layout/LayoutState.h index 56c471caff..19088e7d53 100644 --- a/Userland/Libraries/LibWeb/Layout/LayoutState.h +++ b/Userland/Libraries/LibWeb/Layout/LayoutState.h @@ -100,6 +100,9 @@ struct LayoutState { CSSPixels inset_top { 0 }; CSSPixels inset_bottom { 0 }; + // Used for calculating the static position of an abspos block-level box. + CSSPixels vertical_offset_of_parent_block_container { 0 }; + Vector line_boxes; CSSPixels margin_box_left() const { return margin_left + border_left_collapsed() + padding_left; }