diff --git a/Libraries/LibWeb/CSS/CascadedProperties.cpp b/Libraries/LibWeb/CSS/CascadedProperties.cpp index 9179a75ab03..c793ecafcc4 100644 --- a/Libraries/LibWeb/CSS/CascadedProperties.cpp +++ b/Libraries/LibWeb/CSS/CascadedProperties.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include namespace Web::CSS { @@ -99,17 +101,19 @@ void CascadedProperties::set_property(PropertyID property_id, NonnullRefPtr value) { - auto& entries = m_properties.ensure(property_id); + StyleComputer::for_each_property_expanding_shorthands(property_id, value, [this](PropertyID longhand_property_id, CSSStyleValue const& longhand_value) { + auto& entries = m_properties.ensure(longhand_property_id); - entries.append(Entry { - .property = StyleProperty { - .important = Important::No, - .property_id = property_id, - .value = value, - }, - .origin = CascadeOrigin::Author, - .layer_name = {}, - .source = nullptr, + entries.append(Entry { + .property = StyleProperty { + .important = Important::No, + .property_id = longhand_property_id, + .value = longhand_value, + }, + .origin = CascadeOrigin::Author, + .layer_name = {}, + .source = nullptr, + }); }); } diff --git a/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-irrelevant.txt b/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-irrelevant.txt index f94275db528..b862d57c11b 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-irrelevant.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-irrelevant.txt @@ -2,8 +2,8 @@ Harness status: OK Found 42 tests -37 Pass -5 Fail +38 Pass +4 Fail Pass clip-path presentation attribute supported on an irrelevant element Pass clip-rule presentation attribute supported on an irrelevant element Pass color presentation attribute supported on an irrelevant element @@ -25,7 +25,7 @@ Pass letter-spacing presentation attribute supported on an irrelevant element Pass mask-type presentation attribute supported on an irrelevant element Pass mask presentation attribute supported on an irrelevant element Pass opacity presentation attribute supported on an irrelevant element -Fail overflow presentation attribute supported on an irrelevant element +Pass overflow presentation attribute supported on an irrelevant element Pass pointer-events presentation attribute supported on an irrelevant element Pass stop-color presentation attribute supported on an irrelevant element Pass stop-opacity presentation attribute supported on an irrelevant element diff --git a/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-relevant.txt b/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-relevant.txt index 03ba9d91a18..2ce4bab34e1 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-relevant.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-relevant.txt @@ -2,8 +2,8 @@ Harness status: OK Found 52 tests -40 Pass -12 Fail +41 Pass +11 Fail Pass clip-path presentation attribute supported on a relevant element Pass clip-rule presentation attribute supported on a relevant element Pass color presentation attribute supported on a relevant element @@ -28,7 +28,7 @@ Pass letter-spacing presentation attribute supported on a relevant element Pass mask-type presentation attribute supported on a relevant element Pass mask presentation attribute supported on a relevant element Pass opacity presentation attribute supported on a relevant element -Fail overflow presentation attribute supported on a relevant element +Pass overflow presentation attribute supported on a relevant element Pass pointer-events presentation attribute supported on a relevant element Pass r presentation attribute supported on a relevant element Fail rx presentation attribute supported on a relevant element diff --git a/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-unknown.txt b/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-unknown.txt index 9ebb97a4c3a..0bf6cd8e972 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-unknown.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/svg/styling/presentation-attributes-unknown.txt @@ -2,8 +2,8 @@ Harness status: OK Found 42 tests -37 Pass -5 Fail +38 Pass +4 Fail Pass clip-path presentation attribute supported on an unknown SVG element Pass clip-rule presentation attribute supported on an unknown SVG element Pass color presentation attribute supported on an unknown SVG element @@ -25,7 +25,7 @@ Pass letter-spacing presentation attribute supported on an unknown SVG element Pass mask-type presentation attribute supported on an unknown SVG element Pass mask presentation attribute supported on an unknown SVG element Pass opacity presentation attribute supported on an unknown SVG element -Fail overflow presentation attribute supported on an unknown SVG element +Pass overflow presentation attribute supported on an unknown SVG element Pass pointer-events presentation attribute supported on an unknown SVG element Pass stop-color presentation attribute supported on an unknown SVG element Pass stop-opacity presentation attribute supported on an unknown SVG element