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

LibWeb: Make CSSStyleDeclaration GC-allocated

Browse source
This commit is contained in:
Andreas Kling 2022-08-07 16:21:26 +02:00
parent 12042f0757
commit 72bacba97b
18 changed files with 146 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -295,7 +295,7 @@ RefPtr<Layout::Node> Element::create_layout_node_for_display_type(DOM::Document&
CSS::CSSStyleDeclaration const* Element::inline_style() const
{
return m_inline_style;
return m_inline_style.cell();
}
void Element::parse_attribute(FlyString const& name, String const& value)
@ -311,9 +311,9 @@ void Element::parse_attribute(FlyString const& name, String const& value)
m_class_list->associated_attribute_changed(value);
} else if (name == HTML::AttributeNames::style) {
// https://drafts.csswg.org/cssom/#ref-for-cssstyledeclaration-updating-flag
if (m_inline_style && m_inline_style->is_updating())
if (m_inline_style.cell() && m_inline_style->is_updating())
return;
m_inline_style = parse_css_style_attribute(CSS::Parser::ParsingContext(document()), value, *this);
m_inline_style = JS::make_handle(parse_css_style_attribute(CSS::Parser::ParsingContext(document()), value, *this));
set_needs_style_update(true);
}
}
@ -321,8 +321,8 @@ void Element::parse_attribute(FlyString const& name, String const& value)
void Element::did_remove_attribute(FlyString const& name)
{
if (name == HTML::AttributeNames::style) {
if (m_inline_style) {
m_inline_style = nullptr;
if (m_inline_style.cell()) {
m_inline_style = {};
set_needs_style_update(true);
}
}
@ -507,11 +507,11 @@ void Element::set_shadow_root(RefPtr<ShadowRoot> shadow_root)
invalidate_style();
}
NonnullRefPtr<CSS::CSSStyleDeclaration> Element::style_for_bindings()
CSS::CSSStyleDeclaration* Element::style_for_bindings()
{
if (!m_inline_style)
m_inline_style = CSS::ElementInlineCSSStyleDeclaration::create(*this, {}, {});
return *m_inline_style;
if (m_inline_style.is_null())
m_inline_style = JS::make_handle(CSS::ElementInlineCSSStyleDeclaration::create(*this, {}, {}));
return m_inline_style.cell();
}
// https://dom.spec.whatwg.org/#element-html-uppercased-qualified-name

4
Userland/Libraries/LibWeb/DOM/Element.h
View file

@ -105,7 +105,7 @@ public:
CSS::CSSStyleDeclaration const* inline_style() const;
NonnullRefPtr<CSS::CSSStyleDeclaration> style_for_bindings();
CSS::CSSStyleDeclaration* style_for_bindings();
String inner_html() const;
ExceptionOr<void> set_inner_html(String const&);
@ -152,7 +152,7 @@ private:
String m_html_uppercased_qualified_name;
NonnullRefPtr<NamedNodeMap> m_attributes;
RefPtr<CSS::ElementInlineCSSStyleDeclaration> m_inline_style;
JS::Handle<CSS::ElementInlineCSSStyleDeclaration> m_inline_style;
RefPtr<CSS::StyleProperties> m_computed_css_values;
HashMap<FlyString, CSS::StyleProperty> m_custom_properties;