From d477039abca1835814a4e02105d1b32c4ff94979 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 25 Nov 2020 20:29:03 +0100 Subject: [PATCH] LibWeb: Rename Layout::LayoutTreeBuilder => Layout::TreeBuilder --- Libraries/LibWeb/CMakeLists.txt | 2 +- Libraries/LibWeb/DOM/Document.cpp | 4 ++-- Libraries/LibWeb/DOM/Element.cpp | 4 ++-- .../Layout/{LayoutTreeBuilder.cpp => TreeBuilder.cpp} | 6 +++--- .../LibWeb/Layout/{LayoutTreeBuilder.h => TreeBuilder.h} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename Libraries/LibWeb/Layout/{LayoutTreeBuilder.cpp => TreeBuilder.cpp} (95%) rename Libraries/LibWeb/Layout/{LayoutTreeBuilder.h => TreeBuilder.h} (96%) diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 5d0ee2b27e..35d12d0299 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -151,7 +151,6 @@ set(SOURCES Layout/InlineFormattingContext.cpp Layout/InlineNode.cpp Layout/LayoutPosition.cpp - Layout/LayoutTreeBuilder.cpp Layout/LineBox.cpp Layout/LineBoxFragment.cpp Layout/ListItemBox.cpp @@ -168,6 +167,7 @@ set(SOURCES Layout/TableRowBox.cpp Layout/TableRowGroupBox.cpp Layout/TextNode.cpp + Layout/TreeBuilder.cpp Layout/WidgetBox.cpp LayoutTreeModel.cpp Loader/FrameLoader.cpp diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp index efd8d90b75..3f13b3f663 100644 --- a/Libraries/LibWeb/DOM/Document.cpp +++ b/Libraries/LibWeb/DOM/Document.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include #include @@ -348,7 +348,7 @@ void Document::layout() return; if (!m_layout_root) { - Layout::LayoutTreeBuilder tree_builder; + Layout::TreeBuilder tree_builder; m_layout_root = static_ptr_cast(tree_builder.build(*this)); } diff --git a/Libraries/LibWeb/DOM/Element.cpp b/Libraries/LibWeb/DOM/Element.cpp index 7e0ab56d8f..0ff0371be7 100644 --- a/Libraries/LibWeb/DOM/Element.cpp +++ b/Libraries/LibWeb/DOM/Element.cpp @@ -36,12 +36,12 @@ #include #include #include -#include #include #include #include #include #include +#include namespace Web::DOM { @@ -206,7 +206,7 @@ void Element::recompute_style() if (style->display() == CSS::Display::None) return; // We need a new layout tree here! - Layout::LayoutTreeBuilder tree_builder; + Layout::TreeBuilder tree_builder; tree_builder.build(*this); return; } diff --git a/Libraries/LibWeb/Layout/LayoutTreeBuilder.cpp b/Libraries/LibWeb/Layout/TreeBuilder.cpp similarity index 95% rename from Libraries/LibWeb/Layout/LayoutTreeBuilder.cpp rename to Libraries/LibWeb/Layout/TreeBuilder.cpp index 83fd63de7a..7b20178093 100644 --- a/Libraries/LibWeb/Layout/LayoutTreeBuilder.cpp +++ b/Libraries/LibWeb/Layout/TreeBuilder.cpp @@ -26,14 +26,14 @@ #include #include -#include #include #include #include +#include namespace Web::Layout { -LayoutTreeBuilder::LayoutTreeBuilder() +TreeBuilder::TreeBuilder() { } @@ -77,7 +77,7 @@ static RefPtr create_layout_tree(DOM::Node& node, const CSS::StyleProperti return layout_node; } -RefPtr LayoutTreeBuilder::build(DOM::Node& node) +RefPtr TreeBuilder::build(DOM::Node& node) { if (!is(node) && node.has_children()) { dbg() << "FIXME: Support building partial layout trees."; diff --git a/Libraries/LibWeb/Layout/LayoutTreeBuilder.h b/Libraries/LibWeb/Layout/TreeBuilder.h similarity index 96% rename from Libraries/LibWeb/Layout/LayoutTreeBuilder.h rename to Libraries/LibWeb/Layout/TreeBuilder.h index fe96b3db88..23da674584 100644 --- a/Libraries/LibWeb/Layout/LayoutTreeBuilder.h +++ b/Libraries/LibWeb/Layout/TreeBuilder.h @@ -31,9 +31,9 @@ namespace Web::Layout { -class LayoutTreeBuilder { +class TreeBuilder { public: - LayoutTreeBuilder(); + TreeBuilder(); RefPtr build(DOM::Node&); };