RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 18:47:44 +00:00
Code Issues Activity Actions

LibWeb: Store box's containing line box fragment in FormattingState

Browse source 
Layout should not change any properties of a box until the moment a
FormattingState is committed.
This commit is contained in:
Andreas Kling 2022-02-28 12:41:23 +01:00
parent aa72ebf7aa
commit f8aa0c144f
5 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Layout/Box.cpp
View file

@ -236,7 +236,7 @@ const Gfx::FloatRect Box::absolute_rect() const
return rect; return rect;
} }
void Box::set_containing_line_box_fragment(LineBoxFragmentCoordinate fragment_coordinate) void Box::set_containing_line_box_fragment(Optional<LineBoxFragmentCoordinate> fragment_coordinate)
{ {
m_containing_line_box_fragment = fragment_coordinate; m_containing_line_box_fragment = fragment_coordinate;
} }

11
Userland/Libraries/LibWeb/Layout/Box.h
View file

@ -14,6 +14,11 @@
namespace Web::Layout { namespace Web::Layout {
struct LineBoxFragmentCoordinate {
size_t line_box_index { 0 };
size_t fragment_index { 0 };
};
class Box : public NodeWithStyleAndBoxModelMetrics { class Box : public NodeWithStyleAndBoxModelMetrics {
public: public:
struct OverflowData { struct OverflowData {
@ -82,11 +87,7 @@ public:
bool is_body() const; bool is_body() const;
struct LineBoxFragmentCoordinate { void set_containing_line_box_fragment(Optional<LineBoxFragmentCoordinate>);
size_t line_box_index { 0 };
size_t fragment_index { 0 };
};
void set_containing_line_box_fragment(LineBoxFragmentCoordinate);
StackingContext* stacking_context() { return m_stacking_context; } StackingContext* stacking_context() { return m_stacking_context; }
const StackingContext* stacking_context() const { return m_stacking_context; } const StackingContext* stacking_context() const { return m_stacking_context; }

1
Userland/Libraries/LibWeb/Layout/FormattingState.cpp
View file

@ -44,6 +44,7 @@ void FormattingState::commit()
box.set_offset(node_state.offset); box.set_offset(node_state.offset);
box.set_content_size(node_state.content_width, node_state.content_height); box.set_content_size(node_state.content_width, node_state.content_height);
box.set_overflow_data(move(node_state.overflow_data)); box.set_overflow_data(move(node_state.overflow_data));
box.set_containing_line_box_fragment(node_state.containing_line_box_fragment);
} }
// For block containers, transfer line boxes. // For block containers, transfer line boxes.

2
Userland/Libraries/LibWeb/Layout/FormattingState.h
View file

@ -63,6 +63,8 @@ struct FormattingState {
return *overflow_data; return *overflow_data;
} }
Optional<LineBoxFragmentCoordinate> containing_line_box_fragment;
// NOTE: NodeState is ref-counted and accessed via copy-on-write helpers below. // NOTE: NodeState is ref-counted and accessed via copy-on-write helpers below.
size_t ref_count { 1 }; size_t ref_count { 1 };
void ref() void ref()

7
Userland/Libraries/LibWeb/Layout/LineBuilder.cpp
View file

@ -51,16 +51,15 @@ LineBox& LineBuilder::ensure_last_line_box()
void LineBuilder::append_box(Box const& box, float leading_size, float trailing_size) void LineBuilder::append_box(Box const& box, float leading_size, float trailing_size)
{ {
auto const& box_state = m_formatting_state.get(box); auto& box_state = m_formatting_state.get_mutable(box);
auto& line_box = ensure_last_line_box(); auto& line_box = ensure_last_line_box();
line_box.add_fragment(box, 0, 0, leading_size, trailing_size, box_state.content_width, box_state.content_height, box_state.border_box_top(), box_state.border_box_bottom()); line_box.add_fragment(box, 0, 0, leading_size, trailing_size, box_state.content_width, box_state.content_height, box_state.border_box_top(), box_state.border_box_bottom());
m_max_height_on_current_line = max(m_max_height_on_current_line, box_state.content_height); m_max_height_on_current_line = max(m_max_height_on_current_line, box_state.content_height);
// FIXME: Move this to FormattingContext! box_state.containing_line_box_fragment = LineBoxFragmentCoordinate {
const_cast<Box&>(box).set_containing_line_box_fragment({
.line_box_index = m_containing_block_state.line_boxes.size() - 1, .line_box_index = m_containing_block_state.line_boxes.size() - 1,
.fragment_index = line_box.fragments().size() - 1, .fragment_index = line_box.fragments().size() - 1,
}); };
} }
void LineBuilder::append_text_chunk(TextNode const& text_node, size_t offset_in_node, size_t length_in_node, float leading_size, float trailing_size, float content_width, float content_height) void LineBuilder::append_text_chunk(TextNode const& text_node, size_t offset_in_node, size_t length_in_node, float leading_size, float trailing_size, float content_width, float content_height)