diff --git a/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp b/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp index a22e93a11d9..225af000d99 100644 --- a/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp +++ b/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp @@ -106,6 +106,9 @@ String MediaQuery::MediaCondition::to_string() const case Type::Or: builder.join(" or ", conditions); break; + case Type::GeneralEnclosed: + builder.append(general_enclosed->to_string()); + break; } builder.append(')'); return builder.to_string(); @@ -122,6 +125,8 @@ MatchResult MediaQuery::MediaCondition::evaluate(DOM::Window const& window) cons return evaluate_and(conditions, [&](auto& child) { return child.evaluate(window); }); case Type::Or: return evaluate_or(conditions, [&](auto& child) { return child.evaluate(window); }); + case Type::GeneralEnclosed: + return general_enclosed->evaluate(); } VERIFY_NOT_REACHED(); } diff --git a/Userland/Libraries/LibWeb/CSS/MediaQuery.h b/Userland/Libraries/LibWeb/CSS/MediaQuery.h index 279f65a906d..eb2b7598f8f 100644 --- a/Userland/Libraries/LibWeb/CSS/MediaQuery.h +++ b/Userland/Libraries/LibWeb/CSS/MediaQuery.h @@ -65,11 +65,13 @@ public: And, Or, Not, + GeneralEnclosed, }; Type type; MediaFeature feature; NonnullOwnPtrVector conditions; + Optional general_enclosed; MatchResult evaluate(DOM::Window const&) const; String to_string() const; diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 008caf27835..1d511ce0eb8 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -752,6 +752,7 @@ NonnullRefPtr Parser::parse_media_query(TokenStream Parser::consume_media_condition(TokenStream& tokens) { // "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 Parser::consume_media_condition(TokenStream ([and | or] )*" + // ( ` [ * | * ]` in the grammar ) NonnullOwnPtrVector child_conditions; Optional condition_type {}; auto as_condition_type = [](auto& token) -> Optional { @@ -836,7 +838,7 @@ OwnPtr Parser::consume_media_condition(TokenStream" + // `` 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 Parser::consume_media_condition(TokenStream` + 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 {}; }