mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-10-16 13:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Handle custom properties on CSSStyleProperties list

Browse source
This commit is contained in:
luizgfc 2025-08-16 16:25:20 -03:00 • committed by Sam Atkins
commit 3b5df12b38
Notes: github-actions[bot] 2025-09-18 08:26:37 +00:00
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Libraries/LibWeb/CSS/CSSStyleProperties.cpp
View file

@ -123,22 +123,20 @@ void CSSStyleProperties::visit_edges(Visitor& visitor)
size_t CSSStyleProperties::length() const size_t CSSStyleProperties::length() const
{ {
// The length attribute must return the number of CSS declarations in the declarations. // The length attribute must return the number of CSS declarations in the declarations.
// FIXME: Include the number of custom properties.
if (is_computed()) { if (is_computed()) {
if (!owner_node().has_value()) if (!owner_node().has_value())
return 0; return 0;
return number_of_longhand_properties; return number_of_longhand_properties;
} }
return m_properties.size(); return m_properties.size() + m_custom_properties.size();
} }
String CSSStyleProperties::item(size_t index) const String CSSStyleProperties::item(size_t index) const
{ {
// The item(index) method must return the property name of the CSS declaration at position index. // The item(index) method must return the property name of the CSS declaration at position index.
// If there is no indexth object in the collection, then the method must return the empty string. // If there is no indexth object in the collection, then the method must return the empty string.
// FIXME: Include custom properties. auto custom_properties_count = m_custom_properties.size();
if (index >= length()) if (index >= length())
return {}; return {};
@ -148,7 +146,13 @@ String CSSStyleProperties::item(size_t index) const
return string_from_property_id(property_id).to_string(); return string_from_property_id(property_id).to_string();
} }
return CSS::string_from_property_id(m_properties[index].property_id).to_string(); if (index < custom_properties_count) {
auto keys = m_custom_properties.keys();
auto custom_property = m_custom_properties.get(keys[index]);
return custom_property.ptr()->custom_name.to_string();
}
return CSS::string_from_property_id(m_properties[index - custom_properties_count].property_id).to_string();
} }
Optional<StyleProperty> CSSStyleProperties::property(PropertyID property_id) const Optional<StyleProperty> CSSStyleProperties::property(PropertyID property_id) const
@ -957,7 +961,7 @@ String CSSStyleProperties::serialized() const
// NB: The spec treats custom properties the same as any other property, and expects the above loop to handle them. // NB: The spec treats custom properties the same as any other property, and expects the above loop to handle them.
// However, our implementation separates them from regular properties, so we need to handle them separately here. // However, our implementation separates them from regular properties, so we need to handle them separately here.
// FIXME: Is the relative order of custom properties and regular properties supposed to be preserved? // FIXME: Is the relative order of custom properties and regular properties supposed to be preserved?
for (auto& declaration : m_custom_properties) { for (auto const& declaration : m_custom_properties) {
// 1. Let property be declaration’s property name. // 1. Let property be declaration’s property name.
auto const& property = declaration.key; auto const& property = declaration.key;

10
Tests/LibWeb/Text/expected/wpt-import/css/css-nesting/nested-declarations-cssom.txt
View file

@ -2,14 +2,14 @@ Harness status: OK
Found 12 tests Found 12 tests
8 Pass 11 Pass
4 Fail 1 Fail
Fail Trailing declarations Pass Trailing declarations
Fail Mixed declarations Fail Mixed declarations
Fail CSSNestedDeclarations.style Pass CSSNestedDeclarations.style
Pass Nested group rule Pass Nested group rule
Pass Nested @scope rule Pass Nested @scope rule
Fail Inner rule starting with an ident Pass Inner rule starting with an ident
Pass Inserting a CSSNestedDeclaration rule into style rule Pass Inserting a CSSNestedDeclaration rule into style rule
Pass Inserting a CSSNestedDeclaration rule into nested group rule Pass Inserting a CSSNestedDeclaration rule into nested group rule
Pass Attempting to insert a CSSNestedDeclaration rule into top-level @media rule Pass Attempting to insert a CSSNestedDeclaration rule into top-level @media rule