RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:37:35 +00:00
Code Issues Activity Actions

LibWeb: Make Layout::Node::containing_block() return a Layout::Box

Browse source 
Containing blocks can be formed by boxes that aren't block containers,
so let's make this return a Box and work towards type correctness here.
This commit is contained in:
Andreas Kling 2023-01-23 14:59:51 +01:00
parent d5480a44e5
commit 51555dea7c
6 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -75,14 +75,9 @@ void PaintableBox::set_content_size(CSSPixelSize size)
CSSPixelPoint PaintableBox::effective_offset() const
{
CSSPixelPoint offset;
if (m_containing_line_box_fragment.has_value()) {
// FIXME: This is a hack to deal with situations where the layout tree has been garbage collected.
// We could avoid this by making the paintable tree garbage collected as well.
if (!containing_block() || !containing_block()->paint_box())
return offset;
auto const& fragment = containing_block()->paint_box()->line_boxes()[m_containing_line_box_fragment->line_box_index].fragments()[m_containing_line_box_fragment->fragment_index];
if (containing_block() && m_containing_line_box_fragment.has_value()) {
auto& paintable_with_lines = *verify_cast<PaintableWithLines>(containing_block()->paint_box());
auto const& fragment = paintable_with_lines.line_boxes()[m_containing_line_box_fragment->line_box_index].fragments()[m_containing_line_box_fragment->fragment_index];
offset = fragment.offset();
} else {
offset = m_offset;