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

LibWeb: Use property_accepts_value() for overflow parsing

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

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

@ -2418,25 +2418,12 @@ RefPtr<StyleValue> Parser::parse_list_style_value(ParsingContext const& context,
RefPtr<StyleValue> Parser::parse_overflow_value(ParsingContext const& context, Vector<StyleComponentValueRule> const& component_values) RefPtr<StyleValue> Parser::parse_overflow_value(ParsingContext const& context, Vector<StyleComponentValueRule> const& component_values)
{ {
auto is_overflow = [](StyleValue const& value) -> bool {
switch (value.to_identifier()) {
case ValueID::Auto:
case ValueID::Clip:
case ValueID::Hidden:
case ValueID::Scroll:
case ValueID::Visible:
return true;
default:
return false;
}
};
if (component_values.size() == 1) { if (component_values.size() == 1) {
auto maybe_value = parse_css_value(context, component_values.first()); auto maybe_value = parse_css_value(context, component_values.first());
if (!maybe_value) if (!maybe_value)
return nullptr; return nullptr;
auto value = maybe_value.release_nonnull(); auto value = maybe_value.release_nonnull();
if (is_overflow(*value)) if (property_accepts_value(PropertyID::Overflow, *value))
return OverflowStyleValue::create(value, value); return OverflowStyleValue::create(value, value);
return nullptr; return nullptr;
} }
@ -2449,8 +2436,9 @@ RefPtr<StyleValue> Parser::parse_overflow_value(ParsingContext const& context, V
return nullptr; return nullptr;
auto x_value = maybe_x_value.release_nonnull(); auto x_value = maybe_x_value.release_nonnull();
auto y_value = maybe_y_value.release_nonnull(); auto y_value = maybe_y_value.release_nonnull();
if (!is_overflow(x_value) || !is_overflow(y_value)) if (!property_accepts_value(PropertyID::OverflowX, x_value) || !property_accepts_value(PropertyID::OverflowY, y_value)) {
return nullptr; return nullptr;
}
return OverflowStyleValue::create(x_value, y_value); return OverflowStyleValue::create(x_value, y_value);
} }