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

LibWeb: Rename LayoutNode classes and move them into Layout namespace

Browse source 
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!)
This commit is contained in:
Andreas Kling 2020-11-22 15:53:01 +01:00
parent f358f2255f
commit 5aeab9878e
114 changed files with 863 additions and 880 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Libraries/LibWeb/Painting/StackingContext.cpp
View file

@ -26,13 +26,13 @@
#include <AK/QuickSort.h>
#include <LibWeb/DOM/Node.h>
#include <LibWeb/Layout/LayoutBox.h>
#include <LibWeb/Layout/LayoutDocument.h>
#include <LibWeb/Layout/Box.h>
#include <LibWeb/Layout/InitialContainingBlockBox.h>
#include <LibWeb/Painting/StackingContext.h>
namespace Web {
namespace Web::Layout {
StackingContext::StackingContext(LayoutBox& box, StackingContext* parent)
StackingContext::StackingContext(Box& box, StackingContext* parent)
: m_box(box)
, m_parent(parent)
{
@ -47,14 +47,14 @@ StackingContext::StackingContext(LayoutBox& box, StackingContext* parent)
}
}
void StackingContext::paint(PaintContext& context, LayoutNode::PaintPhase phase)
void StackingContext::paint(PaintContext& context, Node::PaintPhase phase)
{
if (!m_box.is_root()) {
m_box.paint(context, phase);
} else {
// NOTE: LayoutDocument::paint() merely calls StackingContext::paint()
// NOTE: InitialContainingBlockBox::paint() merely calls StackingContext::paint()
// so we call its base class instead.
downcast<LayoutDocument>(m_box).LayoutBlock::paint(context, phase);
downcast<InitialContainingBlockBox>(m_box).BlockBox::paint(context, phase);
}
for (auto* child : m_children) {
child->paint(context, phase);
@ -67,9 +67,9 @@ HitTestResult StackingContext::hit_test(const Gfx::IntPoint& position, HitTestTy
if (!m_box.is_root()) {
result = m_box.hit_test(position, type);
} else {
// NOTE: LayoutDocument::hit_test() merely calls StackingContext::hit_test()
// NOTE: InitialContainingBlockBox::hit_test() merely calls StackingContext::hit_test()
// so we call its base class instead.
result = downcast<LayoutDocument>(m_box).LayoutBlock::hit_test(position, type);
result = downcast<InitialContainingBlockBox>(m_box).BlockBox::hit_test(position, type);
}
for (auto* child : m_children) {

12
Libraries/LibWeb/Painting/StackingContext.h
View file

@ -27,26 +27,24 @@
#pragma once
#include <AK/Vector.h>
#include <LibWeb/Layout/LayoutNode.h>
#include <LibWeb/Layout/Node.h>
namespace Web {
class LayoutBox;
namespace Web::Layout {
class StackingContext {
public:
StackingContext(LayoutBox&, StackingContext* parent);
StackingContext(Box&, StackingContext* parent);
StackingContext* parent() { return m_parent; }
const StackingContext* parent() const { return m_parent; }
void paint(PaintContext&, LayoutNode::PaintPhase);
void paint(PaintContext&, Layout::Node::PaintPhase);
HitTestResult hit_test(const Gfx::IntPoint&, HitTestType) const;
void dump(int indent = 0) const;
private:
LayoutBox& m_box;
Box& m_box;
StackingContext* const m_parent { nullptr };
Vector<StackingContext*> m_children;
};