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

LibWeb: Remove specified style from layout nodes

Browse source 
Layout nodes now only carry CSS computer values with them. The main
idea here is to give them only what they need to perform layout, and
leave the rest back in the DOM.
This commit is contained in:
Andreas Kling 2021-01-06 14:10:53 +01:00
parent cc024bdcc0
commit d9b2650dcc
10 changed files with 57 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Libraries/LibWeb/Layout/Node.h
View file

@ -126,7 +126,6 @@ public:
bool can_contain_boxes_with_position_absolute() const;
const Gfx::Font& font() const;
const CSS::StyleProperties& specified_style() const;
const CSS::ImmutableComputedValues& computed_values() const;
NodeWithStyle* parent();
@ -198,9 +197,6 @@ class NodeWithStyle : public Node {
public:
virtual ~NodeWithStyle() override { }
const CSS::StyleProperties& specified_style() const { return m_specified_style; }
void set_specified_style(const CSS::StyleProperties& style) { m_specified_style = style; }
const CSS::ImmutableComputedValues& computed_values() const { return static_cast<const CSS::ImmutableComputedValues&>(m_computed_values); }
void apply_style(const CSS::StyleProperties&);
@ -210,8 +206,11 @@ public:
float font_size() const { return m_font_size; }
const CSS::ImageStyleValue* background_image() const { return m_background_image; }
NonnullRefPtr<NodeWithStyle> create_anonymous_wrapper() const;
protected:
NodeWithStyle(DOM::Document&, DOM::Node*, NonnullRefPtr<CSS::StyleProperties>);
NodeWithStyle(DOM::Document&, DOM::Node*, CSS::ComputedValues);
private:
CSS::ComputedValues m_computed_values;
@ -220,7 +219,6 @@ private:
float m_font_size { 0 };
RefPtr<CSS::ImageStyleValue> m_background_image;
NonnullRefPtr<CSS::StyleProperties> m_specified_style;
CSS::Position m_position;
};
@ -235,6 +233,11 @@ protected:
{
}
NodeWithStyleAndBoxModelMetrics(DOM::Document& document, DOM::Node* node, CSS::ComputedValues computed_values)
: NodeWithStyle(document, node, move(computed_values))
{
}
private:
BoxModelMetrics m_box_model;
};
@ -253,13 +256,6 @@ inline float Node::font_size() const
return parent()->font_size();
}
inline const CSS::StyleProperties& Node::specified_style() const
{
if (m_has_style)
return static_cast<const NodeWithStyle*>(this)->specified_style();
return parent()->specified_style();
}
inline const CSS::ImmutableComputedValues& Node::computed_values() const
{
if (m_has_style)