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

LibWeb: Make display: foo box constructors take the Element by pointer

Browse source 
This means we can instantiate them for pseudo-elements, which don't have
an associated Element. They all pass it to their parent as a
`Layout::Node*` and handle a lack of `layout_node()` already so this
won't affect any functionality.
This commit is contained in:
Sam Atkins 2022-02-23 20:25:35 +00:00 • committed by Andreas Kling
parent adaab23149
commit 7bb721bea2
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWeb/DOM/Element.cpp
View file

@ -205,7 +205,7 @@ RefPtr<Layout::Node> Element::create_layout_node(NonnullRefPtr<CSS::StylePropert
return adopt_ref(*new Layout::TableBox(document(), this, move(style))); return adopt_ref(*new Layout::TableBox(document(), this, move(style)));
if (display.is_list_item()) if (display.is_list_item())
return adopt_ref(*new Layout::ListItemBox(document(), *this, move(style))); return adopt_ref(*new Layout::ListItemBox(document(), this, move(style)));
if (display.is_table_row()) if (display.is_table_row())
return adopt_ref(*new Layout::TableRowBox(document(), this, move(style))); return adopt_ref(*new Layout::TableRowBox(document(), this, move(style)));
@ -214,7 +214,7 @@ RefPtr<Layout::Node> Element::create_layout_node(NonnullRefPtr<CSS::StylePropert
return adopt_ref(*new Layout::TableCellBox(document(), this, move(style))); return adopt_ref(*new Layout::TableCellBox(document(), this, move(style)));
if (display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group()) if (display.is_table_row_group() || display.is_table_header_group() || display.is_table_footer_group())
return adopt_ref(*new Layout::TableRowGroupBox(document(), *this, move(style))); return adopt_ref(*new Layout::TableRowGroupBox(document(), this, move(style)));
if (display.is_table_column() || display.is_table_column_group() || display.is_table_caption()) { if (display.is_table_column() || display.is_table_column_group() || display.is_table_caption()) {
// FIXME: This is just an incorrect placeholder until we improve table layout support. // FIXME: This is just an incorrect placeholder until we improve table layout support.
@ -228,10 +228,10 @@ RefPtr<Layout::Node> Element::create_layout_node(NonnullRefPtr<CSS::StylePropert
return block; return block;
} }
if (display.is_flow_inside()) if (display.is_flow_inside())
return adopt_ref(*new Layout::InlineNode(document(), *this, move(style))); return adopt_ref(*new Layout::InlineNode(document(), this, move(style)));
dbgln_if(LIBWEB_CSS_DEBUG, "FIXME: Support display: {}", display.to_string()); dbgln_if(LIBWEB_CSS_DEBUG, "FIXME: Support display: {}", display.to_string());
return adopt_ref(*new Layout::InlineNode(document(), *this, move(style))); return adopt_ref(*new Layout::InlineNode(document(), this, move(style)));
} }
if (display.is_flow_inside() || display.is_flow_root_inside() || display.is_flex_inside()) if (display.is_flow_inside() || display.is_flow_root_inside() || display.is_flex_inside())

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

@ -17,8 +17,8 @@
namespace Web::Layout { namespace Web::Layout {
InlineNode::InlineNode(DOM::Document& document, DOM::Element& element, NonnullRefPtr<CSS::StyleProperties> style) InlineNode::InlineNode(DOM::Document& document, DOM::Element* element, NonnullRefPtr<CSS::StyleProperties> style)
: Layout::NodeWithStyleAndBoxModelMetrics(document, &element, move(style)) : Layout::NodeWithStyleAndBoxModelMetrics(document, element, move(style))
{ {
set_inline(true); set_inline(true);
} }

2
Userland/Libraries/LibWeb/Layout/InlineNode.h
View file

@ -12,7 +12,7 @@ namespace Web::Layout {
class InlineNode : public NodeWithStyleAndBoxModelMetrics { class InlineNode : public NodeWithStyleAndBoxModelMetrics {
public: public:
InlineNode(DOM::Document&, DOM::Element&, NonnullRefPtr<CSS::StyleProperties>); InlineNode(DOM::Document&, DOM::Element*, NonnullRefPtr<CSS::StyleProperties>);
virtual ~InlineNode() override; virtual ~InlineNode() override;
virtual void paint(PaintContext&, PaintPhase) override; virtual void paint(PaintContext&, PaintPhase) override;

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

@ -10,8 +10,8 @@
namespace Web::Layout { namespace Web::Layout {
ListItemBox::ListItemBox(DOM::Document& document, DOM::Element& element, NonnullRefPtr<CSS::StyleProperties> style) ListItemBox::ListItemBox(DOM::Document& document, DOM::Element* element, NonnullRefPtr<CSS::StyleProperties> style)
: Layout::BlockContainer(document, &element, move(style)) : Layout::BlockContainer(document, element, move(style))
{ {
} }

2
Userland/Libraries/LibWeb/Layout/ListItemBox.h
View file

@ -13,7 +13,7 @@ namespace Web::Layout {
class ListItemBox final : public BlockContainer { class ListItemBox final : public BlockContainer {
public: public:
ListItemBox(DOM::Document&, DOM::Element&, NonnullRefPtr<CSS::StyleProperties>); ListItemBox(DOM::Document&, DOM::Element*, NonnullRefPtr<CSS::StyleProperties>);
virtual ~ListItemBox() override; virtual ~ListItemBox() override;
DOM::Element& dom_node() { return static_cast<DOM::Element&>(*BlockContainer::dom_node()); } DOM::Element& dom_node() { return static_cast<DOM::Element&>(*BlockContainer::dom_node()); }

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

@ -11,8 +11,8 @@
namespace Web::Layout { namespace Web::Layout {
TableRowGroupBox::TableRowGroupBox(DOM::Document& document, DOM::Element& element, NonnullRefPtr<CSS::StyleProperties> style) TableRowGroupBox::TableRowGroupBox(DOM::Document& document, DOM::Element* element, NonnullRefPtr<CSS::StyleProperties> style)
: Layout::BlockContainer(document, &element, move(style)) : Layout::BlockContainer(document, element, move(style))
{ {
} }

2
Userland/Libraries/LibWeb/Layout/TableRowGroupBox.h
View file

@ -12,7 +12,7 @@ namespace Web::Layout {
class TableRowGroupBox final : public BlockContainer { class TableRowGroupBox final : public BlockContainer {
public: public:
TableRowGroupBox(DOM::Document&, DOM::Element&, NonnullRefPtr<CSS::StyleProperties>); TableRowGroupBox(DOM::Document&, DOM::Element*, NonnullRefPtr<CSS::StyleProperties>);
virtual ~TableRowGroupBox() override; virtual ~TableRowGroupBox() override;
size_t column_count() const; size_t column_count() const;