summaryrefslogtreecommitdiff
path: root/Libraries/LibWeb/DOM/Element.cpp
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-11-22 15:53:01 +0100
committerAndreas Kling <kling@serenityos.org>2020-11-22 15:56:27 +0100
commit5aeab9878ebb3b9749be633e9d5812a3181141ca (patch)
treed36c2af3ff959b79ce7886a57a78357015078936 /Libraries/LibWeb/DOM/Element.cpp
parentf358f2255fec7228b7ddf510936a2b7a150e509e (diff)
downloadserenity-5aeab9878ebb3b9749be633e9d5812a3181141ca.zip
LibWeb: Rename LayoutNode classes and move them into Layout namespace
Bring the names of various boxes closer to spec language. This should hopefully make things easier to understand and hack on. :^) Some notable changes: - LayoutNode -> Layout::Node - LayoutBox -> Layout::Box - LayoutBlock -> Layout::BlockBox - LayoutReplaced -> Layout::ReplacedBox - LayoutDocument -> Layout::InitialContainingBlockBox - LayoutText -> Layout::TextNode - LayoutInline -> Layout::InlineNode Note that this is not strictly a "box tree" as we also hang inline/text nodes in the same tree, and they don't generate boxes. (Instead, they contribute line box fragments to their containing block!)
Diffstat (limited to 'Libraries/LibWeb/DOM/Element.cpp')
-rw-r--r--Libraries/LibWeb/DOM/Element.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/Libraries/LibWeb/DOM/Element.cpp b/Libraries/LibWeb/DOM/Element.cpp
index 51b77ea9f7..7e0ab56d8f 100644
--- a/Libraries/LibWeb/DOM/Element.cpp
+++ b/Libraries/LibWeb/DOM/Element.cpp
@@ -34,14 +34,14 @@
#include <LibWeb/DOM/Text.h>
#include <LibWeb/Dump.h>
#include <LibWeb/HTML/Parser/HTMLDocumentParser.h>
-#include <LibWeb/Layout/LayoutBlock.h>
-#include <LibWeb/Layout/LayoutInline.h>
-#include <LibWeb/Layout/LayoutListItem.h>
-#include <LibWeb/Layout/LayoutTable.h>
-#include <LibWeb/Layout/LayoutTableCell.h>
-#include <LibWeb/Layout/LayoutTableRow.h>
-#include <LibWeb/Layout/LayoutTableRowGroup.h>
+#include <LibWeb/Layout/BlockBox.h>
+#include <LibWeb/Layout/InlineNode.h>
#include <LibWeb/Layout/LayoutTreeBuilder.h>
+#include <LibWeb/Layout/ListItemBox.h>
+#include <LibWeb/Layout/TableBox.h>
+#include <LibWeb/Layout/TableCellBox.h>
+#include <LibWeb/Layout/TableRowBox.h>
+#include <LibWeb/Layout/TableRowGroupBox.h>
namespace Web::DOM {
@@ -112,7 +112,7 @@ bool Element::has_class(const FlyString& class_name) const
return false;
}
-RefPtr<LayoutNode> Element::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> Element::create_layout_node(const CSS::StyleProperties* parent_style)
{
auto style = document().style_resolver().resolve_style(*this, parent_style);
const_cast<Element&>(*this).m_resolved_style = style;
@@ -125,26 +125,26 @@ RefPtr<LayoutNode> Element::create_layout_node(const CSS::StyleProperties* paren
return nullptr;
if (display == CSS::Display::Block)
- return adopt(*new LayoutBlock(document(), this, move(style)));
+ return adopt(*new Layout::BlockBox(document(), this, move(style)));
if (display == CSS::Display::Inline) {
if (style->float_().value_or(CSS::Float::None) != CSS::Float::None)
- return adopt(*new LayoutBlock(document(), this, move(style)));
- return adopt(*new LayoutInline(document(), *this, move(style)));
+ return adopt(*new Layout::BlockBox(document(), this, move(style)));
+ return adopt(*new Layout::InlineNode(document(), *this, move(style)));
}
if (display == CSS::Display::ListItem)
- return adopt(*new LayoutListItem(document(), *this, move(style)));
+ return adopt(*new Layout::ListItemBox(document(), *this, move(style)));
if (display == CSS::Display::Table)
- return adopt(*new LayoutTable(document(), *this, move(style)));
+ return adopt(*new Layout::TableBox(document(), *this, move(style)));
if (display == CSS::Display::TableRow)
- return adopt(*new LayoutTableRow(document(), *this, move(style)));
+ return adopt(*new Layout::TableRowBox(document(), *this, move(style)));
if (display == CSS::Display::TableCell)
- return adopt(*new LayoutTableCell(document(), *this, move(style)));
+ return adopt(*new Layout::TableCellBox(document(), *this, move(style)));
if (display == CSS::Display::TableRowGroup || display == CSS::Display::TableHeaderGroup || display == CSS::Display::TableFooterGroup)
- return adopt(*new LayoutTableRowGroup(document(), *this, move(style)));
+ return adopt(*new Layout::TableRowGroupBox(document(), *this, move(style)));
if (display == CSS::Display::InlineBlock) {
- auto inline_block = adopt(*new LayoutBlock(document(), this, move(style)));
+ auto inline_block = adopt(*new Layout::BlockBox(document(), this, move(style)));
inline_block->set_inline(true);
return inline_block;
}
@@ -206,7 +206,7 @@ void Element::recompute_style()
if (style->display() == CSS::Display::None)
return;
// We need a new layout tree here!
- LayoutTreeBuilder tree_builder;
+ Layout::LayoutTreeBuilder tree_builder;
tree_builder.build(*this);
return;
}