RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-02 22:42:08 +00:00
Code Issues Activity Actions

LibWeb: Start making our layout system "transactional"

Browse source 
This patch adds a map of Layout::Node to FormattingState::NodeState.
Instead of updating layout nodes incrementally as layout progresses
through the formatting contexts, all updates are now written to the
corresponding NodeState instead.

At the end of layout, FormattingState::commit() is called, which
transfers all the values from the NodeState objects to the Node.

This will soon allow us to perform completely non-destructive layouts
which don't affect the tree.

Note that there are many imperfections here, and still many places
where we assign to the NodeState, but later read directly from the Node
instead. I'm just committing at this stage to make subsequent diffs
easier to understand.
This commit is contained in:
Andreas Kling 2022-02-20 15:51:24 +01:00
parent 561612f219
commit c9700e100e
27 changed files with 754 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
View file

@ -16,7 +16,7 @@
namespace Web::Layout {
TableFormattingContext::TableFormattingContext(FormattingState& state, BlockContainer& block_container, FormattingContext* parent)
TableFormattingContext::TableFormattingContext(FormattingState& state, BlockContainer const& block_container, FormattingContext* parent)
: BlockFormattingContext(state, block_container, parent)
{
}
@ -25,14 +25,18 @@ TableFormattingContext::~TableFormattingContext()
{
}
void TableFormattingContext::run(Box& box, LayoutMode)
void TableFormattingContext::run(Box const& box, LayoutMode)
{
auto& box_state = m_state.ensure(box);
compute_width(box);
float total_content_width = 0;
float total_content_height = 0;
box.for_each_child_of_type<TableRowGroupBox>([&](auto& row_group_box) {
auto& row_group_box_state = m_state.ensure(row_group_box);
compute_width(row_group_box);
auto column_count = row_group_box.column_count();
Vector<float> column_widths;
@ -46,47 +50,51 @@ void TableFormattingContext::run(Box& box, LayoutMode)
float content_height = 0;
row_group_box.template for_each_child_of_type<TableRowBox>([&](auto& row) {
row.set_offset(0, content_height);
auto& row_state = m_state.ensure(row);
row_state.offset = { 0, content_height };
layout_row(row, column_widths);
content_width = max(content_width, row.content_width());
content_height += row.content_height();
content_width = max(content_width, row_state.content_width);
content_height += row_state.content_height;
});
if (row_group_box.computed_values().width().has_value() && row_group_box.computed_values().width()->is_length() && row_group_box.computed_values().width()->length().is_auto())
row_group_box.set_content_width(content_width);
row_group_box.set_content_height(content_height);
row_group_box_state.content_width = content_width;
row_group_box_state.content_height = content_height;
row_group_box.set_offset(0, total_content_height);
row_group_box_state.offset = { 0, total_content_height };
total_content_height += content_height;
total_content_width = max(total_content_width, row_group_box.content_width());
total_content_width = max(total_content_width, row_group_box_state.content_width);
});
if (box.computed_values().width().has_value() && box.computed_values().width()->is_length() && box.computed_values().width()->length().is_auto())
box.set_content_width(total_content_width);
box_state.content_width = total_content_width;
// FIXME: This is a total hack, we should respect the 'height' property.
box.set_content_height(total_content_height);
box_state.content_height = total_content_height;
}
void TableFormattingContext::calculate_column_widths(Box& row, Vector<float>& column_widths)
void TableFormattingContext::calculate_column_widths(Box const& row, Vector<float>& column_widths)
{
m_state.ensure(row);
size_t column_index = 0;
auto* table = row.first_ancestor_of_type<TableBox>();
bool use_auto_layout = !table || (!table->computed_values().width().has_value() || (table->computed_values().width()->is_length() && table->computed_values().width()->length().is_auto()));
row.for_each_child_of_type<TableCellBox>([&](auto& cell) {
auto& cell_state = m_state.ensure(cell);
compute_width(cell);
if (use_auto_layout) {
(void)layout_inside(cell, LayoutMode::OnlyRequiredLineBreaks);
} else {
(void)layout_inside(cell, LayoutMode::Default);
}
column_widths[column_index] = max(column_widths[column_index], cell.content_width());
column_widths[column_index] = max(column_widths[column_index], cell_state.content_width);
column_index += cell.colspan();
});
}
void TableFormattingContext::layout_row(Box& row, Vector<float>& column_widths)
void TableFormattingContext::layout_row(Box const& row, Vector<float>& column_widths)
{
auto& row_state = m_state.ensure(row);
size_t column_index = 0;
float tallest_cell_height = 0;
float content_width = 0;
@ -94,7 +102,8 @@ void TableFormattingContext::layout_row(Box& row, Vector<float>& column_widths)
bool use_auto_layout = !table || (!table->computed_values().width().has_value() || (table->computed_values().width()->is_length() && table->computed_values().width()->length().is_auto()));
row.for_each_child_of_type<TableCellBox>([&](auto& cell) {
cell.set_offset(row.effective_offset().translated(content_width, 0));
auto& cell_state = m_state.ensure(cell);
cell_state.offset = row_state.offset.translated(content_width, 0);
// Layout the cell contents a second time, now that we know its final width.
if (use_auto_layout) {
@ -106,16 +115,17 @@ void TableFormattingContext::layout_row(Box& row, Vector<float>& column_widths)
size_t cell_colspan = cell.colspan();
for (size_t i = 0; i < cell_colspan; ++i)
content_width += column_widths[column_index++];
tallest_cell_height = max(tallest_cell_height, cell.content_height());
tallest_cell_height = max(tallest_cell_height, cell_state.content_height);
});
if (use_auto_layout) {
row.set_content_width(content_width);
row_state.content_width = content_width;
} else {
row.set_content_width(table->content_width());
auto& table_state = m_state.ensure(*table);
row_state.content_width = table_state.content_width;
}
row.set_content_height(tallest_cell_height);
row_state.content_height = tallest_cell_height;
}
}