diff options
Diffstat (limited to 'Userland')
31 files changed, 71 insertions, 71 deletions
diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp index 58c32f73b7..78237e5ae2 100644 --- a/Userland/Applications/Browser/BrowserWindow.cpp +++ b/Userland/Applications/Browser/BrowserWindow.cpp @@ -30,7 +30,7 @@ #include <LibGUI/Widget.h> #include <LibJS/Interpreter.h> #include <LibWeb/Dump.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Loader/ResourceLoader.h> #include <LibWeb/OutOfProcessWebView.h> diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp index 26596713ff..0482b3a783 100644 --- a/Userland/Applications/Browser/Tab.cpp +++ b/Userland/Applications/Browser/Tab.cpp @@ -31,7 +31,7 @@ #include <LibJS/Interpreter.h> #include <LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.h> #include <LibWeb/Layout/BlockBox.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Loader/ResourceLoader.h> #include <LibWeb/OutOfProcessWebView.h> #include <LibWeb/Page/BrowsingContext.h> diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 504b7a1ed7..288c0538b3 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -172,7 +172,7 @@ set(SOURCES Layout/FormattingContext.cpp Layout/FrameBox.cpp Layout/ImageBox.cpp - Layout/InitialContainingBlockBox.cpp + Layout/InitialContainingBlock.cpp Layout/InlineFormattingContext.cpp Layout/InlineNode.cpp Layout/Label.cpp diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index 3c2c1b71d1..1a1a11eab2 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -46,7 +46,7 @@ #include <LibWeb/HTML/HTMLScriptElement.h> #include <LibWeb/HTML/HTMLTitleElement.h> #include <LibWeb/Layout/BlockFormattingContext.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/TreeBuilder.h> #include <LibWeb/Namespace.h> #include <LibWeb/Origin.h> @@ -404,7 +404,7 @@ void Document::update_layout() if (!m_layout_root) { Layout::TreeBuilder tree_builder; - m_layout_root = static_ptr_cast<Layout::InitialContainingBlockBox>(tree_builder.build(*this)); + m_layout_root = static_ptr_cast<Layout::InitialContainingBlock>(tree_builder.build(*this)); } Layout::BlockFormattingContext root_formatting_context(*m_layout_root, nullptr); @@ -442,7 +442,7 @@ void Document::update_style() RefPtr<Layout::Node> Document::create_layout_node() { - return adopt_ref(*new Layout::InitialContainingBlockBox(*this, CSS::StyleProperties::create())); + return adopt_ref(*new Layout::InitialContainingBlock(*this, CSS::StyleProperties::create())); } void Document::set_link_color(Color color) @@ -460,14 +460,14 @@ void Document::set_visited_link_color(Color color) m_visited_link_color = color; } -const Layout::InitialContainingBlockBox* Document::layout_node() const +const Layout::InitialContainingBlock* Document::layout_node() const { - return static_cast<const Layout::InitialContainingBlockBox*>(Node::layout_node()); + return static_cast<const Layout::InitialContainingBlock*>(Node::layout_node()); } -Layout::InitialContainingBlockBox* Document::layout_node() +Layout::InitialContainingBlock* Document::layout_node() { - return static_cast<Layout::InitialContainingBlockBox*>(Node::layout_node()); + return static_cast<Layout::InitialContainingBlock*>(Node::layout_node()); } void Document::set_inspected_node(Node* node) diff --git a/Userland/Libraries/LibWeb/DOM/Document.h b/Userland/Libraries/LibWeb/DOM/Document.h index e3cef337dd..45f859bef4 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.h +++ b/Userland/Libraries/LibWeb/DOM/Document.h @@ -147,8 +147,8 @@ public: virtual bool is_child_allowed(const Node&) const override; - const Layout::InitialContainingBlockBox* layout_node() const; - Layout::InitialContainingBlockBox* layout_node(); + const Layout::InitialContainingBlock* layout_node() const; + Layout::InitialContainingBlock* layout_node(); void schedule_style_update(); void schedule_forced_layout(); @@ -309,7 +309,7 @@ private: RefPtr<Window> m_window; - RefPtr<Layout::InitialContainingBlockBox> m_layout_root; + RefPtr<Layout::InitialContainingBlock> m_layout_root; Optional<Color> m_link_color; Optional<Color> m_active_link_color; diff --git a/Userland/Libraries/LibWeb/DOM/Node.cpp b/Userland/Libraries/LibWeb/DOM/Node.cpp index 201da2877d..db2fcc2233 100644 --- a/Userland/Libraries/LibWeb/DOM/Node.cpp +++ b/Userland/Libraries/LibWeb/DOM/Node.cpp @@ -24,7 +24,7 @@ #include <LibWeb/DOM/ProcessingInstruction.h> #include <LibWeb/DOM/ShadowRoot.h> #include <LibWeb/HTML/HTMLAnchorElement.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/Node.h> #include <LibWeb/Layout/TextNode.h> #include <LibWeb/Origin.h> diff --git a/Userland/Libraries/LibWeb/DOM/Window.cpp b/Userland/Libraries/LibWeb/DOM/Window.cpp index d7d09db181..65492f6c0e 100644 --- a/Userland/Libraries/LibWeb/DOM/Window.cpp +++ b/Userland/Libraries/LibWeb/DOM/Window.cpp @@ -12,7 +12,7 @@ #include <LibWeb/DOM/Timer.h> #include <LibWeb/DOM/Window.h> #include <LibWeb/HighResolutionTime/Performance.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Page/BrowsingContext.h> #include <LibWeb/Page/Page.h> diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index 1d0a230e06..6dda41271f 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -168,7 +168,7 @@ class Box; class ButtonBox; class CheckBox; class FormattingContext; -class InitialContainingBlockBox; +class InitialContainingBlock; class InlineFormattingContext; class Label; class LabelableNode; diff --git a/Userland/Libraries/LibWeb/InProcessWebView.cpp b/Userland/Libraries/LibWeb/InProcessWebView.cpp index e2539d5f22..771b386145 100644 --- a/Userland/Libraries/LibWeb/InProcessWebView.cpp +++ b/Userland/Libraries/LibWeb/InProcessWebView.cpp @@ -16,7 +16,7 @@ #include <LibWeb/HTML/HTMLAnchorElement.h> #include <LibWeb/HTML/Parser/HTMLDocumentParser.h> #include <LibWeb/InProcessWebView.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/TextNode.h> #include <LibWeb/Loader/ResourceLoader.h> #include <LibWeb/Page/BrowsingContext.h> @@ -299,16 +299,16 @@ bool InProcessWebView::load(const URL& url) return page().top_level_browsing_context().loader().load(url, FrameLoader::Type::Navigation); } -const Layout::InitialContainingBlockBox* InProcessWebView::layout_root() const +const Layout::InitialContainingBlock* InProcessWebView::layout_root() const { return document() ? document()->layout_node() : nullptr; } -Layout::InitialContainingBlockBox* InProcessWebView::layout_root() +Layout::InitialContainingBlock* InProcessWebView::layout_root() { if (!document()) return nullptr; - return const_cast<Layout::InitialContainingBlockBox*>(document()->layout_node()); + return const_cast<Layout::InitialContainingBlock*>(document()->layout_node()); } void InProcessWebView::page_did_request_scroll_into_view(const Gfx::IntRect& rect) diff --git a/Userland/Libraries/LibWeb/InProcessWebView.h b/Userland/Libraries/LibWeb/InProcessWebView.h index a6c24bdf96..2d6717f37f 100644 --- a/Userland/Libraries/LibWeb/InProcessWebView.h +++ b/Userland/Libraries/LibWeb/InProcessWebView.h @@ -32,8 +32,8 @@ public: void set_document(DOM::Document*); - const Layout::InitialContainingBlockBox* layout_root() const; - Layout::InitialContainingBlockBox* layout_root(); + const Layout::InitialContainingBlock* layout_root() const; + Layout::InitialContainingBlock* layout_root(); void reload(); bool load(const URL&); diff --git a/Userland/Libraries/LibWeb/Layout/BlockBox.cpp b/Userland/Libraries/LibWeb/Layout/BlockBox.cpp index d295428615..d46d15a25d 100644 --- a/Userland/Libraries/LibWeb/Layout/BlockBox.cpp +++ b/Userland/Libraries/LibWeb/Layout/BlockBox.cpp @@ -7,7 +7,7 @@ #include <LibGfx/Painter.h> #include <LibWeb/Dump.h> #include <LibWeb/Layout/BlockBox.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/InlineFormattingContext.h> #include <LibWeb/Layout/ReplacedBox.h> #include <LibWeb/Layout/TextNode.h> diff --git a/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp index 9e7a0f27e0..17dee023af 100644 --- a/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp @@ -9,7 +9,7 @@ #include <LibWeb/Layout/BlockBox.h> #include <LibWeb/Layout/BlockFormattingContext.h> #include <LibWeb/Layout/Box.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/InlineFormattingContext.h> #include <LibWeb/Layout/ListItemBox.h> #include <LibWeb/Layout/ReplacedBox.h> @@ -28,7 +28,7 @@ BlockFormattingContext::~BlockFormattingContext() bool BlockFormattingContext::is_initial() const { - return is<InitialContainingBlockBox>(context_box()); + return is<InitialContainingBlock>(context_box()); } void BlockFormattingContext::run(Box& box, LayoutMode layout_mode) @@ -526,7 +526,7 @@ void BlockFormattingContext::layout_initial_containing_block(LayoutMode layout_m { auto viewport_rect = context_box().browsing_context().viewport_rect(); - auto& icb = verify_cast<Layout::InitialContainingBlockBox>(context_box()); + auto& icb = verify_cast<Layout::InitialContainingBlock>(context_box()); icb.build_stacking_context_tree(); icb.set_width(viewport_rect.width()); diff --git a/Userland/Libraries/LibWeb/Layout/Box.cpp b/Userland/Libraries/LibWeb/Layout/Box.cpp index da4aa9e0f9..e56b4fd60c 100644 --- a/Userland/Libraries/LibWeb/Layout/Box.cpp +++ b/Userland/Libraries/LibWeb/Layout/Box.cpp @@ -394,7 +394,7 @@ StackingContext* Box::enclosing_stacking_context() VERIFY(ancestor_box.stacking_context()); return ancestor_box.stacking_context(); } - // We should always reach the Layout::InitialContainingBlockBox stacking context. + // We should always reach the Layout::InitialContainingBlock stacking context. VERIFY_NOT_REACHED(); } diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp index 8bcd0282a0..df79a89dd3 100644 --- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp @@ -10,7 +10,7 @@ #include <LibWeb/Layout/BlockFormattingContext.h> #include <LibWeb/Layout/Box.h> #include <LibWeb/Layout/FlexFormattingContext.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/TextNode.h> namespace Web::Layout { diff --git a/Userland/Libraries/LibWeb/Layout/FrameBox.cpp b/Userland/Libraries/LibWeb/Layout/FrameBox.cpp index 48c4ba97cf..ce1003b620 100644 --- a/Userland/Libraries/LibWeb/Layout/FrameBox.cpp +++ b/Userland/Libraries/LibWeb/Layout/FrameBox.cpp @@ -8,7 +8,7 @@ #include <LibGfx/Painter.h> #include <LibWeb/DOM/Document.h> #include <LibWeb/Layout/FrameBox.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Page/BrowsingContext.h> namespace Web::Layout { @@ -52,7 +52,7 @@ void FrameBox::paint(PaintContext& context, PaintPhase phase) context.painter().translate(absolute_x(), absolute_y()); context.set_viewport_rect({ {}, dom_node().nested_browsing_context()->size() }); - const_cast<Layout::InitialContainingBlockBox*>(hosted_layout_tree)->paint_all_phases(context); + const_cast<Layout::InitialContainingBlock*>(hosted_layout_tree)->paint_all_phases(context); context.set_viewport_rect(old_viewport_rect); context.painter().restore(); diff --git a/Userland/Libraries/LibWeb/Layout/InitialContainingBlockBox.cpp b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.cpp index 3863546763..c5ae613169 100644 --- a/Userland/Libraries/LibWeb/Layout/InitialContainingBlockBox.cpp +++ b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.cpp @@ -1,27 +1,27 @@ /* - * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> + * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org> * * SPDX-License-Identifier: BSD-2-Clause */ #include <LibGfx/Painter.h> #include <LibWeb/Dump.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Page/BrowsingContext.h> #include <LibWeb/Painting/StackingContext.h> namespace Web::Layout { -InitialContainingBlockBox::InitialContainingBlockBox(DOM::Document& document, NonnullRefPtr<CSS::StyleProperties> style) +InitialContainingBlock::InitialContainingBlock(DOM::Document& document, NonnullRefPtr<CSS::StyleProperties> style) : BlockBox(document, &document, move(style)) { } -InitialContainingBlockBox::~InitialContainingBlockBox() +InitialContainingBlock::~InitialContainingBlock() { } -void InitialContainingBlockBox::build_stacking_context_tree() +void InitialContainingBlock::build_stacking_context_tree() { if (stacking_context()) return; @@ -42,18 +42,18 @@ void InitialContainingBlockBox::build_stacking_context_tree() }); } -void InitialContainingBlockBox::paint_all_phases(PaintContext& context) +void InitialContainingBlock::paint_all_phases(PaintContext& context) { context.painter().translate(-context.viewport_rect().location()); stacking_context()->paint(context); } -HitTestResult InitialContainingBlockBox::hit_test(const Gfx::IntPoint& position, HitTestType type) const +HitTestResult InitialContainingBlock::hit_test(const Gfx::IntPoint& position, HitTestType type) const { return stacking_context()->hit_test(position, type); } -void InitialContainingBlockBox::recompute_selection_states() +void InitialContainingBlock::recompute_selection_states() { SelectionState state = SelectionState::None; @@ -79,13 +79,13 @@ void InitialContainingBlockBox::recompute_selection_states() }); } -void InitialContainingBlockBox::set_selection(const LayoutRange& selection) +void InitialContainingBlock::set_selection(const LayoutRange& selection) { m_selection = selection; recompute_selection_states(); } -void InitialContainingBlockBox::set_selection_end(const LayoutPosition& position) +void InitialContainingBlock::set_selection_end(const LayoutPosition& position) { m_selection.set_end(position); recompute_selection_states(); diff --git a/Userland/Libraries/LibWeb/Layout/InitialContainingBlockBox.h b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.h index a85637f480..ecc3a6f807 100644 --- a/Userland/Libraries/LibWeb/Layout/InitialContainingBlockBox.h +++ b/Userland/Libraries/LibWeb/Layout/InitialContainingBlock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> + * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org> * * SPDX-License-Identifier: BSD-2-Clause */ @@ -11,10 +11,10 @@ namespace Web::Layout { -class InitialContainingBlockBox final : public BlockBox { +class InitialContainingBlock final : public BlockBox { public: - explicit InitialContainingBlockBox(DOM::Document&, NonnullRefPtr<CSS::StyleProperties>); - virtual ~InitialContainingBlockBox() override; + explicit InitialContainingBlock(DOM::Document&, NonnullRefPtr<CSS::StyleProperties>); + virtual ~InitialContainingBlock() override; const DOM::Document& dom_node() const { return static_cast<const DOM::Document&>(*Node::dom_node()); } @@ -37,6 +37,6 @@ private: }; template<> -inline bool Node::fast_is<InitialContainingBlockBox>() const { return is_initial_containing_block_box(); } +inline bool Node::fast_is<InitialContainingBlock>() const { return is_initial_containing_block_box(); } } diff --git a/Userland/Libraries/LibWeb/Layout/Label.cpp b/Userland/Libraries/LibWeb/Layout/Label.cpp index 0edff98432..3a37c6130f 100644 --- a/Userland/Libraries/LibWeb/Layout/Label.cpp +++ b/Userland/Libraries/LibWeb/Layout/Label.cpp @@ -9,7 +9,7 @@ #include <LibGfx/StylePainter.h> #include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Element.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/Label.h> #include <LibWeb/Layout/LabelableNode.h> #include <LibWeb/Layout/TextNode.h> diff --git a/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp b/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp index adbe6711a0..4a6f37fffe 100644 --- a/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp +++ b/Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp @@ -6,7 +6,7 @@ #include <AK/Utf8View.h> #include <LibGfx/Painter.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/LineBoxFragment.h> #include <LibWeb/Layout/TextNode.h> #include <LibWeb/Painting/PaintContext.h> diff --git a/Userland/Libraries/LibWeb/Layout/Node.cpp b/Userland/Libraries/LibWeb/Layout/Node.cpp index 6d69db73e4..ba43029c98 100644 --- a/Userland/Libraries/LibWeb/Layout/Node.cpp +++ b/Userland/Libraries/LibWeb/Layout/Node.cpp @@ -12,7 +12,7 @@ #include <LibWeb/HTML/HTMLHtmlElement.h> #include <LibWeb/Layout/BlockBox.h> #include <LibWeb/Layout/FormattingContext.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/Node.h> #include <LibWeb/Layout/TextNode.h> #include <LibWeb/Page/BrowsingContext.h> @@ -36,7 +36,7 @@ Node::~Node() bool Node::can_contain_boxes_with_position_absolute() const { - return computed_values().position() != CSS::Position::Static || is<InitialContainingBlockBox>(*this); + return computed_values().position() != CSS::Position::Static || is<InitialContainingBlock>(*this); } const BlockBox* Node::containing_block() const @@ -120,13 +120,13 @@ BrowsingContext& Node::browsing_context() return *document().browsing_context(); } -const InitialContainingBlockBox& Node::root() const +const InitialContainingBlock& Node::root() const { VERIFY(document().layout_node()); return *document().layout_node(); } -InitialContainingBlockBox& Node::root() +InitialContainingBlock& Node::root() { VERIFY(document().layout_node()); return *document().layout_node(); diff --git a/Userland/Libraries/LibWeb/Layout/Node.h b/Userland/Libraries/LibWeb/Layout/Node.h index 3f0f27a1e6..5b1eb44396 100644 --- a/Userland/Libraries/LibWeb/Layout/Node.h +++ b/Userland/Libraries/LibWeb/Layout/Node.h @@ -68,8 +68,8 @@ public: const BrowsingContext& browsing_context() const; BrowsingContext& browsing_context(); - const InitialContainingBlockBox& root() const; - InitialContainingBlockBox& root(); + const InitialContainingBlock& root() const; + InitialContainingBlock& root(); bool is_root_element() const; diff --git a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp index 955416f9a9..a6b0ef59f2 100644 --- a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp +++ b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp @@ -11,7 +11,7 @@ #include <LibWeb/DOM/ParentNode.h> #include <LibWeb/DOM/ShadowRoot.h> #include <LibWeb/Dump.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/Node.h> #include <LibWeb/Layout/TableBox.h> #include <LibWeb/Layout/TableCellBox.h> diff --git a/Userland/Libraries/LibWeb/LayoutTreeModel.cpp b/Userland/Libraries/LibWeb/LayoutTreeModel.cpp index 80f508486c..ff38c59951 100644 --- a/Userland/Libraries/LibWeb/LayoutTreeModel.cpp +++ b/Userland/Libraries/LibWeb/LayoutTreeModel.cpp @@ -8,7 +8,7 @@ #include <AK/StringBuilder.h> #include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Element.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/TextNode.h> #include <ctype.h> #include <stdio.h> @@ -99,7 +99,7 @@ GUI::Variant LayoutTreeModel::data(const GUI::ModelIndex& index, GUI::ModelRole { auto& node = *static_cast<Layout::Node*>(index.internal_data()); if (role == GUI::ModelRole::Icon) { - if (is<Layout::InitialContainingBlockBox>(node)) + if (is<Layout::InitialContainingBlock>(node)) return m_document_icon; if (is<Layout::TextNode>(node)) return m_text_icon; diff --git a/Userland/Libraries/LibWeb/Page/BrowsingContext.cpp b/Userland/Libraries/LibWeb/Page/BrowsingContext.cpp index eafb709217..fc7aaf6a5a 100644 --- a/Userland/Libraries/LibWeb/Page/BrowsingContext.cpp +++ b/Userland/Libraries/LibWeb/Page/BrowsingContext.cpp @@ -10,7 +10,7 @@ #include <LibWeb/DOM/Window.h> #include <LibWeb/HTML/HTMLAnchorElement.h> #include <LibWeb/Layout/BreakNode.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/TextNode.h> #include <LibWeb/Page/BrowsingContext.h> #include <LibWeb/Page/Page.h> diff --git a/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp b/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp index 0fbb90a1a6..60d421196c 100644 --- a/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp +++ b/Userland/Libraries/LibWeb/Page/EditEventHandler.cpp @@ -10,7 +10,7 @@ #include <LibWeb/DOM/Position.h> #include <LibWeb/DOM/Range.h> #include <LibWeb/DOM/Text.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Layout/LayoutPosition.h> #include <LibWeb/Page/BrowsingContext.h> #include <LibWeb/Page/EditEventHandler.h> diff --git a/Userland/Libraries/LibWeb/Page/EventHandler.cpp b/Userland/Libraries/LibWeb/Page/EventHandler.cpp index 81d8c847c1..6b970b9ebb 100644 --- a/Userland/Libraries/LibWeb/Page/EventHandler.cpp +++ b/Userland/Libraries/LibWeb/Page/EventHandler.cpp @@ -12,7 +12,7 @@ #include <LibWeb/HTML/HTMLAnchorElement.h> #include <LibWeb/HTML/HTMLIFrameElement.h> #include <LibWeb/HTML/HTMLImageElement.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Page/BrowsingContext.h> #include <LibWeb/Page/EventHandler.h> #include <LibWeb/Page/Page.h> @@ -97,14 +97,14 @@ EventHandler::~EventHandler() { } -const Layout::InitialContainingBlockBox* EventHandler::layout_root() const +const Layout::InitialContainingBlock* EventHandler::layout_root() const { if (!m_frame.document()) return nullptr; return m_frame.document()->layout_node(); } -Layout::InitialContainingBlockBox* EventHandler::layout_root() +Layout::InitialContainingBlock* EventHandler::layout_root() { if (!m_frame.document()) return nullptr; diff --git a/Userland/Libraries/LibWeb/Page/EventHandler.h b/Userland/Libraries/LibWeb/Page/EventHandler.h index 796bac09cb..095dcb77f1 100644 --- a/Userland/Libraries/LibWeb/Page/EventHandler.h +++ b/Userland/Libraries/LibWeb/Page/EventHandler.h @@ -39,8 +39,8 @@ private: bool focus_next_element(); bool focus_previous_element(); - Layout::InitialContainingBlockBox* layout_root(); - const Layout::InitialContainingBlockBox* layout_root() const; + Layout::InitialContainingBlock* layout_root(); + const Layout::InitialContainingBlock* layout_root() const; BrowsingContext& m_frame; diff --git a/Userland/Libraries/LibWeb/Painting/StackingContext.cpp b/Userland/Libraries/LibWeb/Painting/StackingContext.cpp index 0ddc27942f..bbce8ce0bd 100644 --- a/Userland/Libraries/LibWeb/Painting/StackingContext.cpp +++ b/Userland/Libraries/LibWeb/Painting/StackingContext.cpp @@ -8,7 +8,7 @@ #include <AK/StringBuilder.h> #include <LibGfx/Painter.h> #include <LibWeb/Layout/Box.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Painting/StackingContext.h> namespace Web::Layout { @@ -128,12 +128,12 @@ void StackingContext::paint(PaintContext& context) HitTestResult StackingContext::hit_test(const Gfx::IntPoint& position, HitTestType type) const { HitTestResult result; - if (!is<InitialContainingBlockBox>(m_box)) { + if (!is<InitialContainingBlock>(m_box)) { result = m_box.hit_test(position, type); } else { - // NOTE: InitialContainingBlockBox::hit_test() merely calls StackingContext::hit_test() + // NOTE: InitialContainingBlock::hit_test() merely calls StackingContext::hit_test() // so we call its base class instead. - result = verify_cast<InitialContainingBlockBox>(m_box).BlockBox::hit_test(position, type); + result = verify_cast<InitialContainingBlock>(m_box).BlockBox::hit_test(position, type); } int z_index = m_box.computed_values().z_index().value_or(0); diff --git a/Userland/Services/WebContent/ClientConnection.cpp b/Userland/Services/WebContent/ClientConnection.cpp index ee519bb227..edc9c05fea 100644 --- a/Userland/Services/WebContent/ClientConnection.cpp +++ b/Userland/Services/WebContent/ClientConnection.cpp @@ -18,7 +18,7 @@ #include <LibWeb/Cookie/ParsedCookie.h> #include <LibWeb/DOM/Document.h> #include <LibWeb/Dump.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Loader/ResourceLoader.h> #include <LibWeb/Page/BrowsingContext.h> #include <WebContent/ClientConnection.h> diff --git a/Userland/Services/WebContent/PageHost.cpp b/Userland/Services/WebContent/PageHost.cpp index 95b84a828f..90ec128d77 100644 --- a/Userland/Services/WebContent/PageHost.cpp +++ b/Userland/Services/WebContent/PageHost.cpp @@ -9,7 +9,7 @@ #include <LibGfx/Painter.h> #include <LibGfx/SystemTheme.h> #include <LibWeb/Cookie/ParsedCookie.h> -#include <LibWeb/Layout/InitialContainingBlockBox.h> +#include <LibWeb/Layout/InitialContainingBlock.h> #include <LibWeb/Page/BrowsingContext.h> #include <WebContent/WebContentClientEndpoint.h> @@ -46,7 +46,7 @@ void PageHost::set_palette_impl(const Gfx::PaletteImpl& impl) m_palette_impl = impl; } -Web::Layout::InitialContainingBlockBox* PageHost::layout_root() +Web::Layout::InitialContainingBlock* PageHost::layout_root() { auto* document = page().top_level_browsing_context().document(); if (!document) diff --git a/Userland/Services/WebContent/PageHost.h b/Userland/Services/WebContent/PageHost.h index cce4e4395b..d25ee93465 100644 --- a/Userland/Services/WebContent/PageHost.h +++ b/Userland/Services/WebContent/PageHost.h @@ -63,7 +63,7 @@ private: explicit PageHost(ClientConnection&); - Web::Layout::InitialContainingBlockBox* layout_root(); + Web::Layout::InitialContainingBlock* layout_root(); void setup_palette(); ClientConnection& m_client; |