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

LibWeb: Dimension inline-block and replaced boxes during splitting

Browse source 
Don't wait until fragment layout to compute width/height of boxes on
the line, just do it while we're splitting into lines.
This commit is contained in:
Andreas Kling 2020-12-15 18:40:08 +01:00
parent 4a9dcd974a
commit 23f70535e2
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/Layout/BlockBox.cpp
View file

@ -113,6 +113,8 @@ void BlockBox::split_into_lines(InlineFormattingContext& context, LayoutMode lay
auto& containing_block = context.containing_block(); auto& containing_block = context.containing_block();
auto* line_box = &containing_block.ensure_last_line_box(); auto* line_box = &containing_block.ensure_last_line_box();
context.dimension_box_on_line(*this, layout_mode);
float available_width = context.available_width_at_line(containing_block.line_boxes().size() - 1); float available_width = context.available_width_at_line(containing_block.line_boxes().size() - 1);
if (layout_mode != LayoutMode::OnlyRequiredLineBreaks && line_box->width() > 0 && line_box->width() + border_box_width() > available_width) { if (layout_mode != LayoutMode::OnlyRequiredLineBreaks && line_box->width() > 0 && line_box->width() + border_box_width() > available_width) {

4
Libraries/LibWeb/Layout/InlineFormattingContext.cpp
View file

@ -177,9 +177,6 @@ void InlineFormattingContext::run(Box&, LayoutMode layout_mode)
line_box.fragments()[j].set_offset(offset); line_box.fragments()[j].set_offset(offset);
} }
} }
if (is<Box>(fragment.layout_node()))
dimension_box_on_line(downcast<Box>(fragment.layout_node()), layout_mode);
} }
if (!line_box.fragments().is_empty()) { if (!line_box.fragments().is_empty()) {
@ -236,7 +233,6 @@ void InlineFormattingContext::dimension_box_on_line(Box& box, LayoutMode layout_
} else { } else {
inline_block.set_width(inline_block.style().width().resolved_or_zero(inline_block, containing_block().width()).to_px(inline_block)); inline_block.set_width(inline_block.style().width().resolved_or_zero(inline_block, containing_block().width()).to_px(inline_block));
} }
layout_inside(inline_block, layout_mode); layout_inside(inline_block, layout_mode);
if (inline_block.style().height().is_undefined_or_auto()) { if (inline_block.style().height().is_undefined_or_auto()) {

1
Libraries/LibWeb/Layout/InlineFormattingContext.h
View file

@ -44,7 +44,6 @@ public:
float available_width_at_line(size_t line_index) const; float available_width_at_line(size_t line_index) const;
private:
void dimension_box_on_line(Box&, LayoutMode); void dimension_box_on_line(Box&, LayoutMode);
}; };

9
Libraries/LibWeb/Layout/ReplacedBox.cpp
View file

@ -42,18 +42,17 @@ ReplacedBox::~ReplacedBox()
{ {
} }
void ReplacedBox::split_into_lines(InlineFormattingContext& context, LayoutMode) void ReplacedBox::split_into_lines(InlineFormattingContext& context, LayoutMode layout_mode)
{ {
auto& containing_block = context.containing_block(); auto& containing_block = context.containing_block();
prepare_for_replaced_layout(); prepare_for_replaced_layout();
auto width = context.compute_width_for_replaced_element(*this); context.dimension_box_on_line(*this, layout_mode);
auto height = context.compute_height_for_replaced_element(*this);
auto* line_box = &containing_block.ensure_last_line_box(); auto* line_box = &containing_block.ensure_last_line_box();
if (line_box->width() > 0 && line_box->width() + width > context.available_width_at_line(containing_block.line_boxes().size() - 1)) if (line_box->width() > 0 && line_box->width() + width() > context.available_width_at_line(containing_block.line_boxes().size() - 1))
line_box = &containing_block.add_line_box(); line_box = &containing_block.add_line_box();
line_box->add_fragment(*this, 0, 0, width, height); line_box->add_fragment(*this, 0, 0, width(), height());
} }
} }