mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-30 20:59:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Convert white-space CSS property to shorthand

Browse source 
This exposed a few bugs which caused the following tests to behave
incorrectly:
- `tab-size-text-wrap.html`: This previously relied on a bug where we
  incorrectly treated `white-space: pre` as allowing text wrapping. The
  fix here is to implement the text-wrap CSS shorthand property.

- `execCommand-preserveWhitespace.html`: We don't correctly serialize
  shorthand properties. This is covered by an existing FIXME in
  `CSSStyleProperties::serialized()`

- `white-space-shorthand.html`: The last 5 subtests here fail as we
  don't correctly handle shorthand properties in
  `CSSStyleProperties::remove_property()`. This is covered by an
  existing FIXME in said function.
This commit is contained in:
Callum Law 2025-05-22 00:31:24 +12:00 • committed by Jelle Raaijmakers
commit 94f5a51820
Notes: github-actions[bot] 2025-05-29 10:05:43 +00:00
28 changed files with 568 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -553,6 +553,42 @@ Optional<StyleProperty> CSSStyleProperties::get_property_internal(PropertyID pro
auto left = get_property_internal(PropertyID::PaddingLeft);
return style_property_for_sided_shorthand(property_id, top, right, bottom, left);
}
case PropertyID::WhiteSpace: {
auto white_space_collapse_property = get_property_internal(PropertyID::WhiteSpaceCollapse);
auto text_wrap_mode_property = get_property_internal(PropertyID::TextWrapMode);
auto white_space_trim_property = get_property_internal(PropertyID::WhiteSpaceTrim);
if (!white_space_collapse_property.has_value() || !text_wrap_mode_property.has_value() || !white_space_trim_property.has_value())
break;
RefPtr<CSSStyleValue const> value;
if (white_space_trim_property->value->is_keyword() && white_space_trim_property->value->as_keyword().keyword() == Keyword::None) {
auto white_space_collapse_keyword = white_space_collapse_property->value->as_keyword().keyword();
auto text_wrap_mode_keyword = text_wrap_mode_property->value->as_keyword().keyword();
if (white_space_collapse_keyword == Keyword::Collapse && text_wrap_mode_keyword == Keyword::Wrap)
value = CSSKeywordValue::create(Keyword::Normal);
if (white_space_collapse_keyword == Keyword::Preserve && text_wrap_mode_keyword == Keyword::Nowrap)
value = CSSKeywordValue::create(Keyword::Pre);
if (white_space_collapse_keyword == Keyword::Preserve && text_wrap_mode_keyword == Keyword::Wrap)
value = CSSKeywordValue::create(Keyword::PreWrap);
if (white_space_collapse_keyword == Keyword::PreserveBreaks && text_wrap_mode_keyword == Keyword::Wrap)
value = CSSKeywordValue::create(Keyword::PreLine);
}
if (!value)
break;
return StyleProperty {
.important = white_space_collapse_property->important,
.property_id = property_id,
.value = value.release_nonnull(),
};
}
default:
break;
}