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

LibWeb: Add Ratio type to MediaFeatureValue

Browse source 
As noted, the Parser can't handle the `<number>` syntax for this - it
gets parsed instead by the `<number>` branch. We can't actually resolve
the ambiguity without making the Parser aware of what type each
media-feature is, but I will get to that soon. :^)
This commit is contained in:
Sam Atkins 2022-03-06 17:50:56 +00:00 • committed by Andreas Kling
parent 5f93f1c161
commit deea129b8c
4 changed files with 50 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1153,13 +1153,14 @@ Optional<MediaFeatureValue> Parser::parse_media_feature_value(TokenStream<StyleC
auto position = tokens.position();
tokens.skip_whitespace();
auto& first = tokens.next_token();
tokens.skip_whitespace();
// `<number>`
if (first.is(Token::Type::Number))
if (first.is(Token::Type::Number) && !tokens.has_next_token())
return MediaFeatureValue(first.token().number_value());
// `<dimension>`
if (auto dimension = parse_dimension(first); dimension.has_value()) {
if (auto dimension = parse_dimension(first); dimension.has_value() && !tokens.has_next_token()) {
if (dimension->is_length())
return MediaFeatureValue(dimension->length());
if (dimension->is_resolution())
@ -1167,10 +1168,15 @@ Optional<MediaFeatureValue> Parser::parse_media_feature_value(TokenStream<StyleC
}
// `<ident>`
if (first.is(Token::Type::Ident))
if (first.is(Token::Type::Ident) && !tokens.has_next_token())
return MediaFeatureValue(first.token().ident());
// FIXME: `<ratio>`, once we have ratios.
// `<ratio>`
// Note that a single <number> is a valid <ratio>, but it gets parsed above as a <number>.
// This will get solved with directed parsing of values based on the media-feature.
tokens.rewind_to_position(position);
if (auto ratio = parse_ratio(tokens); ratio.has_value() && !tokens.has_next_token())
return MediaFeatureValue(ratio.release_value());
tokens.rewind_to_position(position);
return {};