From 308c3ccc4459fb9234c5f1222bffbce1b48d5222 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 15 Jun 2020 17:38:44 +0200 Subject: [PATCH] LibWeb: Allow block children of inlines Hey, why not. We did all the hard work for display:inline-block already and now we can just allow this. This makes

Hello friends!

 work :^) --- Libraries/LibWeb/Layout/LayoutBlock.cpp | 2 -- Libraries/LibWeb/Layout/LayoutNode.cpp | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Libraries/LibWeb/Layout/LayoutBlock.cpp b/Libraries/LibWeb/Layout/LayoutBlock.cpp index ec3ed0a188..b139a0e759 100644 --- a/Libraries/LibWeb/Layout/LayoutBlock.cpp +++ b/Libraries/LibWeb/Layout/LayoutBlock.cpp @@ -587,8 +587,6 @@ LineBox& LayoutBlock::add_line_box() void LayoutBlock::split_into_lines(LayoutBlock& container, LayoutMode layout_mode) { - ASSERT(is_inline()); - layout(layout_mode); auto* line_box = &container.ensure_last_line_box(); diff --git a/Libraries/LibWeb/Layout/LayoutNode.cpp b/Libraries/LibWeb/Layout/LayoutNode.cpp index 018be1ef71..afbcb986b8 100644 --- a/Libraries/LibWeb/Layout/LayoutNode.cpp +++ b/Libraries/LibWeb/Layout/LayoutNode.cpp @@ -154,11 +154,7 @@ LayoutDocument& LayoutNode::root() void LayoutNode::split_into_lines(LayoutBlock& container, LayoutMode layout_mode) { for_each_child([&](auto& child) { - if (child.is_inline()) { - child.split_into_lines(container, layout_mode); - } else { - // FIXME: Support block children of inlines. - } + child.split_into_lines(container, layout_mode); }); }