RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 17:52:45 +00:00
Code Issues Activity Actions

LibWeb: Use property_accepts_value() for parsing text-decoration

Browse source
This commit is contained in:
Sam Atkins 2021-09-23 14:58:09 +01:00 • committed by Andreas Kling
parent 4bc9b9eaaa
commit f574f538d2
1 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2447,32 +2447,6 @@ RefPtr<StyleValue> Parser::parse_overflow_value(ParsingContext const& context, V
RefPtr<StyleValue> Parser::parse_text_decoration_value(ParsingContext const& context, Vector<StyleComponentValueRule> const& component_values) RefPtr<StyleValue> Parser::parse_text_decoration_value(ParsingContext const& context, Vector<StyleComponentValueRule> const& component_values)
{ {
auto is_text_decoration_line = [](StyleValue const& value) -> bool {
switch (value.to_identifier()) {
case ValueID::None:
case ValueID::Underline:
case ValueID::Overline:
case ValueID::LineThrough:
case ValueID::Blink:
return true;
default:
return false;
}
};
auto is_text_decoration_style = [](StyleValue const& value) -> bool {
switch (value.to_identifier()) {
case ValueID::Solid:
case ValueID::Double:
case ValueID::Dotted:
case ValueID::Dashed:
case ValueID::Wavy:
return true;
default:
return false;
}
};
if (component_values.size() > 3) if (component_values.size() > 3)
return nullptr; return nullptr;
@ -2486,19 +2460,19 @@ RefPtr<StyleValue> Parser::parse_text_decoration_value(ParsingContext const& con
if (!value) if (!value)
return nullptr; return nullptr;
if (value->is_color()) { if (property_accepts_value(PropertyID::TextDecorationColor, *value)) {
if (decoration_color) if (decoration_color)
return nullptr; return nullptr;
decoration_color = value.release_nonnull(); decoration_color = value.release_nonnull();
continue; continue;
} }
if (is_text_decoration_line(*value)) { if (property_accepts_value(PropertyID::TextDecorationLine, *value)) {
if (decoration_line) if (decoration_line)
return nullptr; return nullptr;
decoration_line = value.release_nonnull(); decoration_line = value.release_nonnull();
continue; continue;
} }
if (is_text_decoration_style(*value)) { if (property_accepts_value(PropertyID::TextDecorationStyle, *value)) {
if (decoration_style) if (decoration_style)
return nullptr; return nullptr;
decoration_style = value.release_nonnull(); decoration_style = value.release_nonnull();