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

LibWeb: Add <general-enclosed> support to Media Queries

Browse source
This commit is contained in:
Sam Atkins 2021-11-24 15:11:59 +00:00 • committed by Andreas Kling
parent b03dac99a5
commit 7d5c626276
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -752,6 +752,7 @@ NonnullRefPtr<MediaQuery> Parser::parse_media_query(TokenStream<StyleComponentVa
OwnPtr<MediaQuery::MediaCondition> Parser::consume_media_condition(TokenStream<StyleComponentValueRule>& tokens)
{
// "not <media-condition>"
// ( `<media-not>` in the grammar )
auto position = tokens.position();
auto& first_token = tokens.peek_token();
if (first_token.is(Token::Type::Ident) && first_token.token().ident().equals_ignoring_case("not"sv)) {
@ -770,6 +771,7 @@ OwnPtr<MediaQuery::MediaCondition> Parser::consume_media_condition(TokenStream<S
}
// "<media-condition> ([and | or] <media-condition>)*"
// ( `<media-in-parens> [ <media-and>* | <media-or>* ]` in the grammar )
NonnullOwnPtrVector<MediaQuery::MediaCondition> child_conditions;
Optional<MediaQuery::MediaCondition::Type> condition_type {};
auto as_condition_type = [](auto& token) -> Optional<MediaQuery::MediaCondition::Type> {
@ -836,7 +838,7 @@ OwnPtr<MediaQuery::MediaCondition> Parser::consume_media_condition(TokenStream<S
return adopt_own(*condition);
}
// "<media-feature>"
// `<media-feature>`
tokens.rewind_to_position(position);
if (auto feature = consume_media_feature(tokens); feature.has_value()) {
auto condition = new MediaQuery::MediaCondition;
@ -845,6 +847,15 @@ OwnPtr<MediaQuery::MediaCondition> Parser::consume_media_condition(TokenStream<S
return adopt_own(*condition);
}
// `<general-enclosed>`
tokens.rewind_to_position(position);
if (auto general_enclosed = parse_general_enclosed(tokens); general_enclosed.has_value()) {
auto condition = new MediaQuery::MediaCondition;
condition->type = MediaQuery::MediaCondition::Type::GeneralEnclosed;
condition->general_enclosed = general_enclosed.release_value();
return adopt_own(*condition);
}
tokens.rewind_to_position(position);
return {};
}