diff --git a/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp b/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp index aebecf686ab..ab60ef84e53 100644 --- a/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp @@ -194,8 +194,6 @@ String ShorthandStyleValue::to_string(SerializationMode mode) const } case PropertyID::Flex: return MUST(String::formatted("{} {} {}", longhand(PropertyID::FlexGrow)->to_string(mode), longhand(PropertyID::FlexShrink)->to_string(mode), longhand(PropertyID::FlexBasis)->to_string(mode))); - case PropertyID::FlexFlow: - return MUST(String::formatted("{} {}", longhand(PropertyID::FlexDirection)->to_string(mode), longhand(PropertyID::FlexWrap)->to_string(mode))); case PropertyID::Font: { auto font_style = longhand(PropertyID::FontStyle); auto font_variant = longhand(PropertyID::FontVariant); @@ -350,8 +348,6 @@ String ShorthandStyleValue::to_string(SerializationMode mode) const return start->to_string(mode); return MUST(String::formatted("{} / {}", start->to_string(mode), end->to_string(mode))); } - case PropertyID::ListStyle: - return MUST(String::formatted("{} {} {}", longhand(PropertyID::ListStylePosition)->to_string(mode), longhand(PropertyID::ListStyleImage)->to_string(mode), longhand(PropertyID::ListStyleType)->to_string(mode))); case PropertyID::Overflow: { auto overflow_x = longhand(PropertyID::OverflowX); auto overflow_y = longhand(PropertyID::OverflowY); diff --git a/Tests/LibWeb/Text/expected/css/CSSStyleProperties-all-supported-properties-and-default-values.txt b/Tests/LibWeb/Text/expected/css/CSSStyleProperties-all-supported-properties-and-default-values.txt index 17783855037..ea3b2e8cf81 100644 --- a/Tests/LibWeb/Text/expected/css/CSSStyleProperties-all-supported-properties-and-default-values.txt +++ b/Tests/LibWeb/Text/expected/css/CSSStyleProperties-all-supported-properties-and-default-values.txt @@ -78,9 +78,9 @@ All supported properties and their default values exposed from CSSStylePropertie 'WebkitFlexDirection': 'row' 'webkitFlexDirection': 'row' '-webkit-flex-direction': 'row' -'WebkitFlexFlow': 'row nowrap' -'webkitFlexFlow': 'row nowrap' -'-webkit-flex-flow': 'row nowrap' +'WebkitFlexFlow': 'row' +'webkitFlexFlow': 'row' +'-webkit-flex-flow': 'row' 'WebkitFlexGrow': '0' 'webkitFlexGrow': '0' '-webkit-flex-grow': '0' @@ -322,8 +322,8 @@ All supported properties and their default values exposed from CSSStylePropertie 'flex-basis': 'auto' 'flexDirection': 'row' 'flex-direction': 'row' -'flexFlow': 'row nowrap' -'flex-flow': 'row nowrap' +'flexFlow': 'row' +'flex-flow': 'row' 'flexGrow': '0' 'flex-grow': '0' 'flexShrink': '1' @@ -432,8 +432,8 @@ All supported properties and their default values exposed from CSSStylePropertie 'letter-spacing': 'normal' 'lineHeight': 'normal' 'line-height': 'normal' -'listStyle': 'outside none disc' -'list-style': 'outside none disc' +'listStyle': 'outside' +'list-style': 'outside' 'listStyleImage': 'none' 'list-style-image': 'none' 'listStylePosition': 'outside' diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/parsing/flex-flow-valid.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/parsing/flex-flow-valid.txt index 3d03218045a..c10fd814c71 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/parsing/flex-flow-valid.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-flexbox/parsing/flex-flow-valid.txt @@ -2,12 +2,11 @@ Harness status: OK Found 7 tests -1 Pass -6 Fail -Fail e.style['flex-flow'] = "column nowrap" should set the property value -Fail e.style['flex-flow'] = "nowrap column" should set the property value +7 Pass +Pass e.style['flex-flow'] = "column nowrap" should set the property value +Pass e.style['flex-flow'] = "nowrap column" should set the property value Pass e.style['flex-flow'] = "wrap row-reverse" should set the property value -Fail e.style['flex-flow'] = "nowrap" should set the property value -Fail e.style['flex-flow'] = "row nowrap" should set the property value -Fail e.style['flex-flow'] = "wrap" should set the property value -Fail e.style['flex-flow'] = "row wrap" should set the property value \ No newline at end of file +Pass e.style['flex-flow'] = "nowrap" should set the property value +Pass e.style['flex-flow'] = "row nowrap" should set the property value +Pass e.style['flex-flow'] = "wrap" should set the property value +Pass e.style['flex-flow'] = "row wrap" should set the property value \ No newline at end of file diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-lists/parsing/list-style-valid.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-lists/parsing/list-style-valid.txt new file mode 100644 index 00000000000..ab813f5f7ca --- /dev/null +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-lists/parsing/list-style-valid.txt @@ -0,0 +1,23 @@ +Harness status: OK + +Found 17 tests + +16 Pass +1 Fail +Pass e.style['list-style'] = "none" should set the property value +Pass e.style['list-style'] = "disc outside none" should set the property value +Pass e.style['list-style'] = "inside" should set the property value +Pass e.style['list-style'] = "inside disc" should set the property value +Pass e.style['list-style'] = "inside none" should set the property value +Pass e.style['list-style'] = "inside none none" should set the property value +Pass e.style['list-style'] = "none inside none" should set the property value +Pass e.style['list-style'] = "none none inside" should set the property value +Pass e.style['list-style'] = "none inside" should set the property value +Pass e.style['list-style'] = "url(\"https://example.com/\")" should set the property value +Pass e.style['list-style'] = "none url(\"https://example.com/\")" should set the property value +Pass e.style['list-style'] = "url(\"https://example.com/\") disc" should set the property value +Pass e.style['list-style'] = "url(\"https://example.com/\") disc outside" should set the property value +Pass e.style['list-style'] = "square" should set the property value +Pass e.style['list-style'] = "square url(\"https://example.com/\") inside" should set the property value +Pass e.style['list-style'] = "square linear-gradient(red,blue) inside" should set the property value +Fail e.style['list-style'] = "disc radial-gradient(circle, #006, #00a 90%, #0000af 100%,white 100%) inside" should set the property value \ No newline at end of file diff --git a/Tests/LibWeb/Text/input/wpt-import/css/css-lists/parsing/list-style-valid.html b/Tests/LibWeb/Text/input/wpt-import/css/css-lists/parsing/list-style-valid.html new file mode 100644 index 00000000000..c593ddbce9d --- /dev/null +++ b/Tests/LibWeb/Text/input/wpt-import/css/css-lists/parsing/list-style-valid.html @@ -0,0 +1,35 @@ + + +
+ +