beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibWeb: Use new StyleValue parsing for border and its sided versions

Browse source
This commit is contained in:
Sam Atkins 2023-05-18 16:41:43 +01:00 committed by Andreas Kling
parent 91c9d10a78
commit 5d8b01ad04
Notes: sideshowbarker 2024-07-16 19:44:42 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/5d8b01ad04
Pull-request: https://github.com/SerenityOS/serenity/pull/19028
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -4719,31 +4719,35 @@ ErrorOr<RefPtr<StyleValue>> Parser::parse_border_value(Vector<ComponentValue> co
RefPtr<StyleValue> border_color;
RefPtr<StyleValue> border_style;
for (auto const& part : component_values) {
auto value = TRY(parse_css_value(part));
if (!value)
return nullptr;
auto remaining_longhands = Vector { PropertyID::BorderWidth, PropertyID::BorderColor, PropertyID::BorderStyle };
if (property_accepts_value(PropertyID::BorderWidth, *value)) {
if (border_width)
return nullptr;
auto tokens = TokenStream { component_values };
while (tokens.has_next_token()) {
auto property_and_value = TRY(parse_css_value_for_properties(remaining_longhands, tokens));
if (!property_and_value.style_value)
return nullptr;
auto& value = property_and_value.style_value;
remove_property(remaining_longhands, property_and_value.property);
switch (property_and_value.property) {
case PropertyID::BorderWidth: {
VERIFY(!border_width);
border_width = value.release_nonnull();
continue;
}
if (property_accepts_value(PropertyID::BorderColor, *value)) {
if (border_color)
return nullptr;
case PropertyID::BorderColor: {
VERIFY(!border_color);
border_color = value.release_nonnull();
continue;
}
if (property_accepts_value(PropertyID::BorderStyle, *value)) {
if (border_style)
return nullptr;
case PropertyID::BorderStyle: {
VERIFY(!border_style);
border_style = value.release_nonnull();
continue;
}
return nullptr;
default:
VERIFY_NOT_REACHED();
}
}
if (!border_width)