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

LibHTML: Add LayoutNodeWithStyle class, make LayoutText style-less

Browse source 
Since LayoutText always inherits style, it shouldn't store any style of
its own. This patch adds a LayoutNodeWithStyle class to sit between
LayoutNode and everyone who wants to inherit from LayoutNode except
LayoutText :^)

Since LayoutText can never have children, we also know that the parent
of any LayoutNode is always going to be a LayoutNodeWithStyle.
So this patch makes LayoutNode::parent() return LayoutNodeWithStyle*.
This commit is contained in:
Andreas Kling 2019-10-07 09:50:31 +02:00
parent 15f3e64862
commit 749e3f0f30
9 changed files with 46 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Libraries/LibHTML/Layout/LayoutNode.h
View file

@ -12,6 +12,7 @@ class Document;
class Element;
class LayoutBlock;
class LayoutNode;
class LayoutNodeWithStyle;
class LineBoxFragment;
class Node;
@ -66,12 +67,9 @@ public:
virtual LayoutNode& inline_wrapper() { return *this; }
const StyleProperties& style() const
{
if (m_style)
return *m_style;
return parent()->style();
}
const StyleProperties& style() const;
const LayoutNodeWithStyle* parent() const;
void inserted_into(LayoutNode&) {}
void removed_from(LayoutNode&) {}
@ -79,13 +77,45 @@ public:
virtual void split_into_lines(LayoutBlock& container);
protected:
explicit LayoutNode(const Node*, RefPtr<StyleProperties>);
explicit LayoutNode(const Node*);
private:
friend class LayoutNodeWithStyle;
const Node* m_node { nullptr };
RefPtr<StyleProperties> m_style;
BoxModelMetrics m_box_metrics;
Rect m_rect;
bool m_inline { false };
bool m_has_style { false };
};
class LayoutNodeWithStyle : public LayoutNode {
public:
virtual ~LayoutNodeWithStyle() override {}
const StyleProperties& style() const { return m_style; }
protected:
explicit LayoutNodeWithStyle(const Node* node, NonnullRefPtr<StyleProperties> style)
: LayoutNode(node)
, m_style(move(style))
{
m_has_style = true;
}
private:
NonnullRefPtr<StyleProperties> m_style;
};
inline const StyleProperties& LayoutNode::style() const
{
if (m_has_style)
return static_cast<const LayoutNodeWithStyle*>(this)->style();
return parent()->style();
}
inline const LayoutNodeWithStyle* LayoutNode::parent() const
{
return static_cast<const LayoutNodeWithStyle*>(TreeNode<LayoutNode>::parent());
}