RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:47:35 +00:00
Code Issues Activity Actions

LibWeb: Rename InitialContainingBlockBox => InitialContainingBlock

Browse source 
The "Box" suffix added nothing here.
This commit is contained in:
Andreas Kling 2021-09-08 11:27:46 +02:00
parent e90ccf6a20
commit e91edcaa28
31 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/Layout/BlockBox.cpp
View file

@ -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>

6
Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp
View file

@ -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());

2
Userland/Libraries/LibWeb/Layout/Box.cpp
View file

@ -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();
}

2
Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp
View file

@ -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 {

4
Userland/Libraries/LibWeb/Layout/FrameBox.cpp
View file

@ -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();

20
Userland/Libraries/LibWeb/Layout/InitialContainingBlockBox.cpp → Userland/Libraries/LibWeb/Layout/InitialContainingBlock.cpp
View file

@ -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();

10
Userland/Libraries/LibWeb/Layout/InitialContainingBlockBox.h → Userland/Libraries/LibWeb/Layout/InitialContainingBlock.h
View file

@ -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(); }
}

2
Userland/Libraries/LibWeb/Layout/Label.cpp
View file

@ -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>

2
Userland/Libraries/LibWeb/Layout/LineBoxFragment.cpp
View file

@ -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>

8
Userland/Libraries/LibWeb/Layout/Node.cpp
View file

@ -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();

4
Userland/Libraries/LibWeb/Layout/Node.h
View file

@ -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;

2
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
View file

@ -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>