diff --git a/Libraries/LibWeb/Layout/BlockBox.cpp b/Libraries/LibWeb/Layout/BlockBox.cpp index 121ff9a8e2..00a0f90c64 100644 --- a/Libraries/LibWeb/Layout/BlockBox.cpp +++ b/Libraries/LibWeb/Layout/BlockBox.cpp @@ -113,6 +113,8 @@ void BlockBox::split_into_lines(InlineFormattingContext& context, LayoutMode lay auto& containing_block = context.containing_block(); 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); if (layout_mode != LayoutMode::OnlyRequiredLineBreaks && line_box->width() > 0 && line_box->width() + border_box_width() > available_width) { diff --git a/Libraries/LibWeb/Layout/InlineFormattingContext.cpp b/Libraries/LibWeb/Layout/InlineFormattingContext.cpp index 295e0fd987..9819baacf7 100644 --- a/Libraries/LibWeb/Layout/InlineFormattingContext.cpp +++ b/Libraries/LibWeb/Layout/InlineFormattingContext.cpp @@ -177,9 +177,6 @@ void InlineFormattingContext::run(Box&, LayoutMode layout_mode) line_box.fragments()[j].set_offset(offset); } } - - if (is(fragment.layout_node())) - dimension_box_on_line(downcast(fragment.layout_node()), layout_mode); } if (!line_box.fragments().is_empty()) { @@ -236,7 +233,6 @@ void InlineFormattingContext::dimension_box_on_line(Box& box, LayoutMode layout_ } else { 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); if (inline_block.style().height().is_undefined_or_auto()) { diff --git a/Libraries/LibWeb/Layout/InlineFormattingContext.h b/Libraries/LibWeb/Layout/InlineFormattingContext.h index 8b7d44d267..38af898d21 100644 --- a/Libraries/LibWeb/Layout/InlineFormattingContext.h +++ b/Libraries/LibWeb/Layout/InlineFormattingContext.h @@ -44,7 +44,6 @@ public: float available_width_at_line(size_t line_index) const; -private: void dimension_box_on_line(Box&, LayoutMode); }; diff --git a/Libraries/LibWeb/Layout/ReplacedBox.cpp b/Libraries/LibWeb/Layout/ReplacedBox.cpp index 7cbf37524b..2ea63bb233 100644 --- a/Libraries/LibWeb/Layout/ReplacedBox.cpp +++ b/Libraries/LibWeb/Layout/ReplacedBox.cpp @@ -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(); prepare_for_replaced_layout(); - auto width = context.compute_width_for_replaced_element(*this); - auto height = context.compute_height_for_replaced_element(*this); + context.dimension_box_on_line(*this, layout_mode); 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->add_fragment(*this, 0, 0, width, height); + line_box->add_fragment(*this, 0, 0, width(), height()); } }