RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:57:34 +00:00
Code Issues Activity Actions

LibWeb: Use property_accepts_value() for font parsing

Browse source
This commit is contained in:
Sam Atkins 2021-09-23 12:05:05 +01:00 • committed by Andreas Kling
parent b927972da7
commit dcf70ab821
1 changed files with 5 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2174,64 +2174,6 @@ RefPtr<StyleValue> Parser::parse_flex_flow_value(ParsingContext const& context,
RefPtr<StyleValue> Parser::parse_font_value(ParsingContext const& context, Vector<StyleComponentValueRule> const& component_values) RefPtr<StyleValue> Parser::parse_font_value(ParsingContext const& context, Vector<StyleComponentValueRule> const& component_values)
{ {
auto is_font_size = [](StyleValue const& value) -> bool {
if (value.is_length())
return true;
switch (value.to_identifier()) {
case ValueID::XxSmall:
case ValueID::XSmall:
case ValueID::Small:
case ValueID::Medium:
case ValueID::Large:
case ValueID::XLarge:
case ValueID::XxLarge:
case ValueID::XxxLarge:
case ValueID::Smaller:
case ValueID::Larger:
return true;
default:
return false;
}
};
auto is_font_style = [](StyleValue const& value) -> bool {
// FIXME: Handle angle parameter to `oblique`: https://www.w3.org/TR/css-fonts-4/#font-style-prop
switch (value.to_identifier()) {
case ValueID::Normal:
case ValueID::Italic:
case ValueID::Oblique:
return true;
default:
return false;
}
};
auto is_font_weight = [](StyleValue const& value) -> bool {
if (value.is_numeric()) {
auto weight = static_cast<NumericStyleValue const&>(value).value();
return (weight >= 1 && weight <= 1000);
}
switch (value.to_identifier()) {
case ValueID::Normal:
case ValueID::Bold:
case ValueID::Bolder:
case ValueID::Lighter:
return true;
default:
return false;
}
};
auto is_line_height = [](StyleValue const& value) -> bool {
if (value.is_numeric())
return true;
if (value.is_length())
return true;
if (value.to_identifier() == ValueID::Normal)
return true;
return false;
};
RefPtr<StyleValue> font_style; RefPtr<StyleValue> font_style;
RefPtr<StyleValue> font_weight; RefPtr<StyleValue> font_weight;
RefPtr<StyleValue> font_size; RefPtr<StyleValue> font_size;
@ -2254,19 +2196,20 @@ RefPtr<StyleValue> Parser::parse_font_value(ParsingContext const& context, Vecto
normal_count++; normal_count++;
continue; continue;
} }
if (is_font_style(*value)) { // FIXME: Handle angle parameter to `oblique`: https://www.w3.org/TR/css-fonts-4/#font-style-prop
if (property_accepts_value(PropertyID::FontStyle, *value)) {
if (font_style) if (font_style)
return nullptr; return nullptr;
font_style = value.release_nonnull(); font_style = value.release_nonnull();
continue; continue;
} }
if (is_font_weight(*value)) { if (property_accepts_value(PropertyID::FontWeight, *value)) {
if (font_weight) if (font_weight)
return nullptr; return nullptr;
font_weight = value.release_nonnull(); font_weight = value.release_nonnull();
continue; continue;
} }
if (is_font_size(*value)) { if (property_accepts_value(PropertyID::FontSize, *value)) {
if (font_size) if (font_size)
return nullptr; return nullptr;
font_size = value.release_nonnull(); font_size = value.release_nonnull();
@ -2276,7 +2219,7 @@ RefPtr<StyleValue> Parser::parse_font_value(ParsingContext const& context, Vecto
auto maybe_solidus = component_values[i + 1]; auto maybe_solidus = component_values[i + 1];
if (maybe_solidus.is(Token::Type::Delim) && maybe_solidus.token().delim() == "/"sv) { if (maybe_solidus.is(Token::Type::Delim) && maybe_solidus.token().delim() == "/"sv) {
auto maybe_line_height = parse_css_value(context, component_values[i + 2]); auto maybe_line_height = parse_css_value(context, component_values[i + 2]);
if (!(maybe_line_height && is_line_height(*maybe_line_height))) if (!(maybe_line_height && property_accepts_value(PropertyID::LineHeight, *maybe_line_height)))
return nullptr; return nullptr;
line_height = maybe_line_height.release_nonnull(); line_height = maybe_line_height.release_nonnull();
i += 2; i += 2;