RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:57:45 +00:00
Code Issues Activity Actions

LibWeb: Use UsedValues containing block pointer in many FC helpers

Browse source
This commit is contained in:
Andreas Kling 2024-01-17 11:24:41 +01:00
parent 8e31bfb83c
commit 80ccfc51c2
2 changed files with 71 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

106
Userland/Libraries/LibWeb/Layout/FormattingContext.cpp
View file

@ -1682,8 +1682,8 @@ CSSPixelRect FormattingContext::absolute_content_rect(Box const& box) const
{ {
auto const& box_state = m_state.get(box); auto const& box_state = m_state.get(box);
CSSPixelRect rect { box_state.offset, { box_state.content_width(), box_state.content_height() } }; CSSPixelRect rect { box_state.offset, { box_state.content_width(), box_state.content_height() } };
for (auto* block = box.containing_block(); block; block = block->containing_block()) for (auto* block = box_state.containing_block_used_values(); block; block = block->containing_block_used_values())
rect.translate_by(m_state.get(*block).offset); rect.translate_by(block->offset);
return rect; return rect;
} }
@ -1742,61 +1742,95 @@ CSSPixels FormattingContext::box_baseline(Box const& box) const
return box_state.margin_box_height(); return box_state.margin_box_height();
} }
CSSPixelRect FormattingContext::margin_box_rect(LayoutState::UsedValues const& used_values) const
{
return {
used_values.offset.translated(-used_values.margin_box_left(), -used_values.margin_box_top()),
{
used_values.margin_box_left() + used_values.content_width() + used_values.margin_box_right(),
used_values.margin_box_top() + used_values.content_height() + used_values.margin_box_bottom(),
},
};
}
CSSPixelRect FormattingContext::margin_box_rect(Box const& box) const CSSPixelRect FormattingContext::margin_box_rect(Box const& box) const
{ {
auto const& box_state = m_state.get(box); return margin_box_rect(m_state.get(box));
return { }
box_state.offset.translated(-box_state.margin_box_left(), -box_state.margin_box_top()),
CSSPixelRect FormattingContext::border_box_rect(LayoutState::UsedValues const& used_values) const
{ {
box_state.margin_box_left() + box_state.content_width() + box_state.margin_box_right(), return {
box_state.margin_box_top() + box_state.content_height() + box_state.margin_box_bottom(), used_values.offset.translated(-used_values.border_box_left(), -used_values.border_box_top()),
{
used_values.border_box_left() + used_values.content_width() + used_values.border_box_right(),
used_values.border_box_top() + used_values.content_height() + used_values.border_box_bottom(),
}, },
}; };
} }
CSSPixelRect FormattingContext::border_box_rect(Box const& box) const CSSPixelRect FormattingContext::border_box_rect(Box const& box) const
{ {
auto const& box_state = m_state.get(box); return border_box_rect(m_state.get(box));
return {
box_state.offset.translated(-box_state.border_box_left(), -box_state.border_box_top()),
{
box_state.border_box_left() + box_state.content_width() + box_state.border_box_right(),
box_state.border_box_top() + box_state.content_height() + box_state.border_box_bottom(),
},
};
} }
CSSPixelRect FormattingContext::border_box_rect_in_ancestor_coordinate_space(Box const& box, Box const& ancestor_box) const CSSPixelRect FormattingContext::border_box_rect_in_ancestor_coordinate_space(LayoutState::UsedValues const& used_values, Box const& ancestor_box) const
{ {
auto rect = border_box_rect(box); auto rect = border_box_rect(used_values);
if (&box == &ancestor_box) if (&used_values.node() == &ancestor_box)
return rect; return rect;
for (auto const* current = box.containing_block(); current; current = current->containing_block()) { for (auto const* current = used_values.containing_block_used_values(); current; current = current->containing_block_used_values()) {
if (current == &ancestor_box) if (&current->node() == &ancestor_box)
return rect; return rect;
auto const& current_state = m_state.get(*current); rect.translate_by(current->offset);
rect.translate_by(current_state.offset);
} }
// If we get here, ancestor_box was not a containing block ancestor of `box`! // If we get here, ancestor_box was not a containing block ancestor of `box`!
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
CSSPixelRect FormattingContext::border_box_rect_in_ancestor_coordinate_space(Box const& box, Box const& ancestor_box) const
{
return border_box_rect_in_ancestor_coordinate_space(m_state.get(box), ancestor_box);
}
CSSPixelRect FormattingContext::content_box_rect(Box const& box) const CSSPixelRect FormattingContext::content_box_rect(Box const& box) const
{ {
auto const& box_state = m_state.get(box); return content_box_rect(m_state.get(box));
return CSSPixelRect { box_state.offset, { box_state.content_width(), box_state.content_height() } }; }
CSSPixelRect FormattingContext::content_box_rect(LayoutState::UsedValues const& used_values) const
{
return CSSPixelRect { used_values.offset, { used_values.content_width(), used_values.content_height() } };
}
CSSPixelRect FormattingContext::content_box_rect_in_ancestor_coordinate_space(LayoutState::UsedValues const& used_values, Box const& ancestor_box) const
{
auto rect = content_box_rect(used_values);
if (&used_values.node() == &ancestor_box)
return rect;
for (auto const* current = used_values.containing_block_used_values(); current; current = current->containing_block_used_values()) {
if (&current->node() == &ancestor_box)
return rect;
rect.translate_by(current->offset);
}
// If we get here, ancestor_box was not a containing block ancestor of `box`!
VERIFY_NOT_REACHED();
} }
CSSPixelRect FormattingContext::content_box_rect_in_ancestor_coordinate_space(Box const& box, Box const& ancestor_box) const CSSPixelRect FormattingContext::content_box_rect_in_ancestor_coordinate_space(Box const& box, Box const& ancestor_box) const
{ {
auto rect = content_box_rect(box); return content_box_rect_in_ancestor_coordinate_space(m_state.get(box), ancestor_box);
if (&box == &ancestor_box) }
CSSPixelRect FormattingContext::margin_box_rect_in_ancestor_coordinate_space(LayoutState::UsedValues const& used_values, Box const& ancestor_box) const
{
auto rect = margin_box_rect(used_values);
if (&used_values.node() == &ancestor_box)
return rect; return rect;
for (auto const* current = box.containing_block(); current; current = current->containing_block()) { for (auto const* current = used_values.containing_block_used_values(); current; current = current->containing_block_used_values()) {
if (current == &ancestor_box) if (&current->node() == &ancestor_box)
return rect; return rect;
auto const& current_state = m_state.get(*current); rect.translate_by(current->offset);
rect.translate_by(current_state.offset);
} }
// If we get here, ancestor_box was not a containing block ancestor of `box`! // If we get here, ancestor_box was not a containing block ancestor of `box`!
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
@ -1804,17 +1838,7 @@ CSSPixelRect FormattingContext::content_box_rect_in_ancestor_coordinate_space(Bo
CSSPixelRect FormattingContext::margin_box_rect_in_ancestor_coordinate_space(Box const& box, Box const& ancestor_box) const CSSPixelRect FormattingContext::margin_box_rect_in_ancestor_coordinate_space(Box const& box, Box const& ancestor_box) const
{ {
auto rect = margin_box_rect(box); return margin_box_rect_in_ancestor_coordinate_space(m_state.get(box), ancestor_box);
if (&box == &ancestor_box)
return rect;
for (auto const* current = box.containing_block(); current; current = current->containing_block()) {
if (current == &ancestor_box)
return rect;
auto const& current_state = m_state.get(*current);
rect.translate_by(current_state.offset);
}
// If we get here, ancestor_box was not a containing block ancestor of `box`!
VERIFY_NOT_REACHED();
} }
bool box_is_sized_as_replaced_element(Box const& box) bool box_is_sized_as_replaced_element(Box const& box)

7
Userland/Libraries/LibWeb/Layout/FormattingContext.h
View file

@ -71,12 +71,19 @@ public:
virtual CSSPixels greatest_child_width(Box const&) const; virtual CSSPixels greatest_child_width(Box const&) const;
[[nodiscard]] CSSPixelRect absolute_content_rect(Box const&) const; [[nodiscard]] CSSPixelRect absolute_content_rect(Box const&) const;
[[nodiscard]] CSSPixelRect absolute_content_rect(LayoutState::UsedValues const&) const;
[[nodiscard]] CSSPixelRect margin_box_rect(Box const&) const; [[nodiscard]] CSSPixelRect margin_box_rect(Box const&) const;
[[nodiscard]] CSSPixelRect margin_box_rect_in_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const; [[nodiscard]] CSSPixelRect margin_box_rect_in_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const;
[[nodiscard]] CSSPixelRect margin_box_rect(LayoutState::UsedValues const&) const;
[[nodiscard]] CSSPixelRect margin_box_rect_in_ancestor_coordinate_space(LayoutState::UsedValues const&, Box const& ancestor_box) const;
[[nodiscard]] CSSPixelRect border_box_rect(Box const&) const; [[nodiscard]] CSSPixelRect border_box_rect(Box const&) const;
[[nodiscard]] CSSPixelRect border_box_rect(LayoutState::UsedValues const&) const;
[[nodiscard]] CSSPixelRect border_box_rect_in_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const; [[nodiscard]] CSSPixelRect border_box_rect_in_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const;
[[nodiscard]] CSSPixelRect border_box_rect_in_ancestor_coordinate_space(LayoutState::UsedValues const&, Box const& ancestor_box) const;
[[nodiscard]] CSSPixelRect content_box_rect(Box const&) const; [[nodiscard]] CSSPixelRect content_box_rect(Box const&) const;
[[nodiscard]] CSSPixelRect content_box_rect(LayoutState::UsedValues const&) const;
[[nodiscard]] CSSPixelRect content_box_rect_in_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const; [[nodiscard]] CSSPixelRect content_box_rect_in_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const;
[[nodiscard]] CSSPixelRect content_box_rect_in_ancestor_coordinate_space(LayoutState::UsedValues const&, Box const& ancestor_box) const;
[[nodiscard]] CSSPixels box_baseline(Box const&) const; [[nodiscard]] CSSPixels box_baseline(Box const&) const;
[[nodiscard]] CSSPixelRect content_box_rect_in_static_position_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const; [[nodiscard]] CSSPixelRect content_box_rect_in_static_position_ancestor_coordinate_space(Box const&, Box const& ancestor_box) const;