mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-21 16:58:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Misc. code cleanup of LayoutState

Browse source 
No functional changes.
This commit is contained in:
Jelle Raaijmakers 2025-08-29 11:00:35 +02:00 • committed by Tim Ledbetter
commit a0b7d0542c
Notes: github-actions[bot] 2025-09-01 10:21:55 +00:00
1 changed files with 40 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

92
Libraries/LibWeb/Layout/LayoutState.cpp
View file

@ -68,8 +68,8 @@ static CSSPixelRect measure_scrollable_overflow(Box const& box)
auto scrollable_overflow_rect = paintable_absolute_padding_box; auto scrollable_overflow_rect = paintable_absolute_padding_box;
// - All line boxes directly contained by the scroll container. // - All line boxes directly contained by the scroll container.
if (is<Painting::PaintableWithLines>(box.first_paintable())) { if (auto const* paintable_with_lines = as_if<Painting::PaintableWithLines>(box.first_paintable())) {
for (auto const& fragment : static_cast<Painting::PaintableWithLines const&>(*box.first_paintable()).fragments()) for (auto const& fragment : paintable_with_lines->fragments())
scrollable_overflow_rect.unite(fragment.absolute_rect()); scrollable_overflow_rect.unite(fragment.absolute_rect());
} }
@ -241,7 +241,7 @@ void LayoutState::commit(Box& root)
HashTable<Layout::TextNode*> text_nodes; HashTable<Layout::TextNode*> text_nodes;
HashTable<Painting::PaintableWithLines*> inline_node_paintables; HashTable<Painting::PaintableWithLines*> inline_node_paintables;
auto transfer_box_model_metrics = [&](Painting::BoxModelMetrics& box_model, UsedValues const& used_values) { auto transfer_box_model_metrics = [](Painting::BoxModelMetrics& box_model, UsedValues const& used_values) {
box_model.inset = { used_values.inset_top, used_values.inset_right, used_values.inset_bottom, used_values.inset_left }; box_model.inset = { used_values.inset_top, used_values.inset_right, used_values.inset_bottom, used_values.inset_left };
box_model.padding = { used_values.padding_top, used_values.padding_right, used_values.padding_bottom, used_values.padding_left }; box_model.padding = { used_values.padding_top, used_values.padding_right, used_values.padding_bottom, used_values.padding_left };
box_model.border = { used_values.border_top, used_values.border_right, used_values.border_bottom, used_values.border_left }; box_model.border = { used_values.border_top, used_values.border_right, used_values.border_bottom, used_values.border_left };
@ -270,63 +270,57 @@ void LayoutState::commit(Box& root)
for (auto& it : used_values_per_layout_node) { for (auto& it : used_values_per_layout_node) {
auto& used_values = *it.value; auto& used_values = *it.value;
auto& node = const_cast<NodeWithStyle&>(used_values.node()); auto& node = used_values.node();
auto paintable = node.create_paintable(); auto paintable = node.create_paintable();
node.add_paintable(paintable); node.add_paintable(paintable);
// For boxes, transfer all the state needed for painting. // For boxes, transfer all the state needed for painting.
if (paintable && is<Painting::PaintableBox>(*paintable)) { if (auto* paintable_box = as_if<Painting::PaintableBox>(paintable.ptr())) {
auto& paintable_box = static_cast<Painting::PaintableBox&>(*paintable); transfer_box_model_metrics(paintable_box->box_model(), used_values);
transfer_box_model_metrics(paintable_box.box_model(), used_values); paintable_box->set_offset(used_values.offset);
paintable_box->set_content_size(used_values.content_width(), used_values.content_height());
if (used_values.override_borders_data().has_value())
paintable_box->set_override_borders_data(used_values.override_borders_data().value());
if (used_values.table_cell_coordinates().has_value())
paintable_box->set_table_cell_coordinates(used_values.table_cell_coordinates().value());
paintable_box.set_offset(used_values.offset); if (auto* paintable_with_lines = as_if<Painting::PaintableWithLines>(*paintable_box)) {
paintable_box.set_content_size(used_values.content_width(), used_values.content_height());
if (used_values.override_borders_data().has_value()) {
paintable_box.set_override_borders_data(used_values.override_borders_data().value());
}
if (used_values.table_cell_coordinates().has_value()) {
paintable_box.set_table_cell_coordinates(used_values.table_cell_coordinates().value());
}
if (is<Painting::PaintableWithLines>(paintable_box)) {
auto& paintable_with_lines = static_cast<Painting::PaintableWithLines&>(paintable_box);
for (size_t line_index = 0; line_index < used_values.line_boxes.size(); ++line_index) { for (size_t line_index = 0; line_index < used_values.line_boxes.size(); ++line_index) {
auto& line_box = used_values.line_boxes[line_index]; auto& line_box = used_values.line_boxes[line_index];
for (auto& fragment : line_box.fragments()) { for (auto& fragment : line_box.fragments()) {
if (fragment.layout_node().is_text_node()) if (auto const* text_node = as_if<TextNode>(fragment.layout_node()))
text_nodes.set(static_cast<Layout::TextNode*>(const_cast<Layout::Node*>(&fragment.layout_node()))); text_nodes.set(const_cast<TextNode*>(text_node));
auto did_relocate_fragment = try_to_relocate_fragment_in_inline_node(fragment, line_index); auto did_relocate_fragment = try_to_relocate_fragment_in_inline_node(fragment, line_index);
if (!did_relocate_fragment) { if (!did_relocate_fragment)
paintable_with_lines.add_fragment(fragment); paintable_with_lines->add_fragment(fragment);
}
} }
} }
} }
if (used_values.computed_svg_transforms().has_value() && is<Painting::SVGGraphicsPaintable>(paintable_box)) { if (auto* svg_graphics_paintable = as_if<Painting::SVGGraphicsPaintable>(paintable.ptr());
auto& svg_graphics_paintable = static_cast<Painting::SVGGraphicsPaintable&>(paintable_box); svg_graphics_paintable && used_values.computed_svg_transforms().has_value()) {
svg_graphics_paintable.set_computed_transforms(*used_values.computed_svg_transforms()); svg_graphics_paintable->set_computed_transforms(*used_values.computed_svg_transforms());
} }
if (used_values.computed_svg_path().has_value() && is<Painting::SVGPathPaintable>(paintable_box)) { if (auto* svg_path_paintable = as_if<Painting::SVGPathPaintable>(paintable.ptr());
auto& svg_geometry_paintable = static_cast<Painting::SVGPathPaintable&>(paintable_box); svg_path_paintable && used_values.computed_svg_path().has_value()) {
svg_geometry_paintable.set_computed_path(move(*used_values.computed_svg_path())); svg_path_paintable->set_computed_path(move(*used_values.computed_svg_path()));
} }
if (node.display().is_grid_inside()) { if (node.display().is_grid_inside()) {
paintable_box.set_used_values_for_grid_template_columns(used_values.grid_template_columns()); paintable_box->set_used_values_for_grid_template_columns(used_values.grid_template_columns());
paintable_box.set_used_values_for_grid_template_rows(used_values.grid_template_rows()); paintable_box->set_used_values_for_grid_template_rows(used_values.grid_template_rows());
} }
} }
} }
// Create paintables for inline nodes without fragments to make possible querying their geometry. // Create paintables for inline nodes without fragments to make possible querying their geometry.
for (auto& inline_node : inline_nodes) { for (auto& inline_node : inline_nodes) {
auto* paintable = inline_node->first_paintable(); if (inline_node->first_paintable())
if (paintable)
continue; continue;
auto line_paintable = inline_node->create_paintable_for_line_with_index(0); auto line_paintable = inline_node->create_paintable_for_line_with_index(0);
inline_node->add_paintable(line_paintable); inline_node->add_paintable(line_paintable);
inline_node_paintables.set(line_paintable.ptr()); inline_node_paintables.set(line_paintable.ptr());
@ -362,6 +356,7 @@ void LayoutState::commit(Box& root)
// Not an atomic inline, much simpler case. // Not an atomic inline, much simpler case.
offset = used_values.offset; offset = used_values.offset;
} }
// Apply relative position inset if appropriate. // Apply relative position inset if appropriate.
if (node.computed_values().position() == CSS::Positioning::Relative && is<NodeWithStyleAndBoxModelMetrics>(node)) { if (node.computed_values().position() == CSS::Positioning::Relative && is<NodeWithStyleAndBoxModelMetrics>(node)) {
auto const& inset = paintable.box_model().inset; auto const& inset = paintable.box_model().inset;
@ -370,9 +365,8 @@ void LayoutState::commit(Box& root)
paintable.set_offset(offset); paintable.set_offset(offset);
} }
for (auto* text_node : text_nodes) { for (auto* text_node : text_nodes)
text_node->add_paintable(text_node->create_paintable()); text_node->add_paintable(text_node->create_paintable());
}
build_paint_tree(root); build_paint_tree(root);
@ -403,6 +397,7 @@ void LayoutState::commit(Box& root)
} }
for (auto const& fragment : fragments) for (auto const& fragment : fragments)
size.set_width(size.width() + fragment.width()); size.set_width(size.width() + fragment.width());
return TraversalDecision::Continue; return TraversalDecision::Continue;
}); });
@ -416,9 +411,8 @@ void LayoutState::commit(Box& root)
} }
if (!paintable_with_lines->fragments().is_empty()) { if (!paintable_with_lines->fragments().is_empty()) {
for (auto const& fragment : paintable_with_lines->fragments()) { for (auto const& fragment : paintable_with_lines->fragments())
size.set_height(max(size.height(), fragment.height())); size.set_height(max(size.height(), fragment.height()));
}
} else { } else {
size.set_height(paintable_with_lines->layout_node().computed_values().line_height()); size.set_height(paintable_with_lines->layout_node().computed_values().line_height());
} }
@ -446,38 +440,32 @@ void LayoutState::commit(Box& root)
auto& used_values = *it.value; auto& used_values = *it.value;
auto& node = used_values.node(); auto& node = used_values.node();
for (auto& paintable : node.paintables()) { for (auto& paintable : node.paintables()) {
Painting::PaintableBox* paintable_box = nullptr; auto* paintable_box = as_if<Painting::PaintableBox>(paintable);
if (is<Painting::PaintableBox>(paintable))
paintable_box = &static_cast<Painting::PaintableBox&>(paintable);
if (!paintable_box) if (!paintable_box)
continue; continue;
if (node.is_sticky_position()) { if (node.is_sticky_position()) {
// https://drafts.csswg.org/css-position/#insets // https://drafts.csswg.org/css-position/#insets
// For sticky positioned boxes, the inset is instead relative to the relevant scrollport’s size. Negative values are allowed. // For sticky positioned boxes, the inset is instead relative to the relevant scrollport’s size.
// Negative values are allowed.
auto sticky_insets = make<Painting::PaintableBox::StickyInsets>(); auto sticky_insets = make<Painting::PaintableBox::StickyInsets>();
auto const& inset = node.computed_values().inset(); auto const& inset = node.computed_values().inset();
auto const* nearest_scrollable_ancestor = paintable_box->nearest_scrollable_ancestor(); auto const* nearest_scrollable_ancestor = paintable_box->nearest_scrollable_ancestor();
CSSPixelSize scrollport_size; CSSPixelSize scrollport_size;
if (nearest_scrollable_ancestor) { if (nearest_scrollable_ancestor)
scrollport_size = nearest_scrollable_ancestor->absolute_rect().size(); scrollport_size = nearest_scrollable_ancestor->absolute_rect().size();
}
if (!inset.top().is_auto()) { if (!inset.top().is_auto())
sticky_insets->top = inset.top().to_px(node, scrollport_size.height()); sticky_insets->top = inset.top().to_px(node, scrollport_size.height());
} if (!inset.right().is_auto())
if (!inset.right().is_auto()) {
sticky_insets->right = inset.right().to_px(node, scrollport_size.width()); sticky_insets->right = inset.right().to_px(node, scrollport_size.width());
} if (!inset.bottom().is_auto())
if (!inset.bottom().is_auto()) {
sticky_insets->bottom = inset.bottom().to_px(node, scrollport_size.height()); sticky_insets->bottom = inset.bottom().to_px(node, scrollport_size.height());
} if (!inset.left().is_auto())
if (!inset.left().is_auto()) {
sticky_insets->left = inset.left().to_px(node, scrollport_size.width()); sticky_insets->left = inset.left().to_px(node, scrollport_size.width());
}
paintable_box->set_sticky_insets(move(sticky_insets)); paintable_box->set_sticky_insets(move(sticky_insets));
} }
} }