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

LibWeb: Make 'auto' be both a Length and Identifier in CSS

Browse source 
I had accidentally parsed it in `parse_builtin_or_dynamic_value()`
instead of `parse_length()` before, which was confusing, so now it's
parsed along with other Lengths.

Whether it should be a Length is up for debate, and has been tripping me
up a few times, but a lot of code expects it to be one. For now, an
'auto' Length value (or any other value which overloads `is_auto()`)
also claims to be a `ValueID::Auto` identifier.
This commit is contained in:
Sam Atkins 2021-08-09 16:02:26 +01:00 • committed by Andreas Kling
parent c8c2a8df56
commit ed962be0fa
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1407,8 +1407,6 @@ RefPtr<StyleValue> Parser::parse_builtin_or_dynamic_value(ParsingContext const&
return InheritStyleValue::create(); return InheritStyleValue::create();
if (ident.equals_ignoring_case("initial")) if (ident.equals_ignoring_case("initial"))
return InitialStyleValue::create(); return InitialStyleValue::create();
if (ident.equals_ignoring_case("auto"))
return LengthStyleValue::create(Length::make_auto());
// FIXME: Implement `unset` keyword // FIXME: Implement `unset` keyword
} }
@ -1493,6 +1491,8 @@ Optional<Length> Parser::parse_length(ParsingContext const& context, StyleCompon
type = Length::Type::Percentage; type = Length::Type::Percentage;
auto value_string = component_value.token().m_value.string_view(); auto value_string = component_value.token().m_value.string_view();
numeric_value = try_parse_float(value_string); numeric_value = try_parse_float(value_string);
} else if (component_value.is(Token::Type::Ident) && component_value.token().ident().equals_ignoring_case("auto")) {
return Length::make_auto();
} }
if (!numeric_value.has_value()) if (!numeric_value.has_value())
@ -1507,7 +1507,12 @@ RefPtr<StyleValue> Parser::parse_length_value(ParsingContext const& context, Sty
// 1) We're in quirks mode, and it's an integer. // 1) We're in quirks mode, and it's an integer.
// 2) It's a 0. // 2) It's a 0.
// We handle case 1 here. Case 2 is handled by NumericStyleValue pretending to be a LengthStyleValue if it is 0. // We handle case 1 here. Case 2 is handled by NumericStyleValue pretending to be a LengthStyleValue if it is 0.
// FIXME: "auto" is also treated as a Length, and most of the time that is how it is used, but not always.
// Possibly it should always be an Identifier, and then quietly converted to a Length when needed, like 0 above.
// Right now, it instead is quietly converted to an Identifier when needed.
if (component_value.is(Token::Type::Dimension) || component_value.is(Token::Type::Percentage) if (component_value.is(Token::Type::Dimension) || component_value.is(Token::Type::Percentage)
|| (component_value.is(Token::Type::Ident) && component_value.token().ident().equals_ignoring_case("auto"sv))
|| (context.in_quirks_mode() && component_value.is(Token::Type::Number) && component_value.token().m_value.string_view() != "0"sv)) { || (context.in_quirks_mode() && component_value.is(Token::Type::Number) && component_value.token().m_value.string_view() != "0"sv)) {
auto length = parse_length(context, component_value); auto length = parse_length(context, component_value);
if (length.has_value()) if (length.has_value())

4
Userland/Libraries/LibWeb/CSS/StyleValue.h
View file

@ -236,7 +236,7 @@ public:
bool is_inherit() const { return type() == Type::Inherit; } bool is_inherit() const { return type() == Type::Inherit; }
bool is_initial() const { return type() == Type::Initial; } bool is_initial() const { return type() == Type::Initial; }
bool is_color() const { return type() == Type::Color; } bool is_color() const { return type() == Type::Color; }
bool is_identifier() const { return type() == Type::Identifier; } bool is_identifier() const { return type() == Type::Identifier || is_auto(); }
bool is_image() const { return type() == Type::Image; } bool is_image() const { return type() == Type::Image; }
bool is_string() const { return type() == Type::String; } bool is_string() const { return type() == Type::String; }
virtual bool is_length() const { return type() == Type::Length; } virtual bool is_length() const { return type() == Type::Length; }
@ -638,6 +638,8 @@ inline CSS::ValueID StyleValue::to_identifier() const
{ {
if (is_identifier()) if (is_identifier())
return static_cast<const IdentifierStyleValue&>(*this).id(); return static_cast<const IdentifierStyleValue&>(*this).id();
if (is_auto())
return CSS::ValueID::Auto;
return CSS::ValueID::Invalid; return CSS::ValueID::Invalid;
} }
} }