RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:27:34 +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

10
Userland/Libraries/LibWeb/Layout/LineBuilder.h
View file

@ -15,12 +15,12 @@ class LineBuilder {
AK_MAKE_NONMOVABLE(LineBuilder);
public:
explicit LineBuilder(InlineFormattingContext&);
LineBuilder(InlineFormattingContext&, FormattingState&);
~LineBuilder();
void break_line();
void append_box(Box&, float leading_size, float trailing_size);
void append_text_chunk(TextNode&, size_t offset_in_node, size_t length_in_node, float leading_size, float trailing_size, float content_width, float content_height);
void append_box(Box const&, float leading_size, float trailing_size);
void append_text_chunk(TextNode const&, size_t offset_in_node, size_t length_in_node, float leading_size, float trailing_size, float content_width, float content_height);
void break_if_needed(LayoutMode layout_mode, float next_item_width, bool should_force_break)
{
@ -39,7 +39,11 @@ private:
bool should_break(LayoutMode, float next_item_width, bool should_force_break);
LineBox& ensure_last_line_box();
InlineFormattingContext& m_context;
FormattingState& m_formatting_state;
FormattingState::NodeState& m_containing_block_state;
float m_available_width_for_current_line { 0 };
float m_current_y { 0 };
float m_max_height_on_current_line { 0 };