mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-28 11:49:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb/CSS: Make media-type more permissive

Browse source 
The current spec defines this simply as `<ident>`, but does apparently
serialize as lowercase.

Because of this change, we no longer need to care about the deprecated
media types, as they all behave the same as unknown ones.

We still keep an enum around for KnownMediaType, to avoid repeated
string comparisons when evaluating it.

Gets us 2 WPT passes.
This commit is contained in:
Sam Atkins 2025-05-19 15:37:56 +01:00
commit 38aca62ef5
Notes: github-actions[bot] 2025-05-23 09:19:52 +00:00
4 changed files with 52 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Libraries/LibWeb/CSS/Parser/MediaParsing.cpp
View file

@ -112,13 +112,11 @@ NonnullRefPtr<MediaQuery> Parser::parse_media_query(TokenStream<ComponentValue>&
// `<media-type>`
if (auto media_type = parse_media_type(tokens); media_type.has_value()) {
// https://drafts.csswg.org/mediaqueries-4/#error-handling
// An unknown <media-type> must be treated as not matching.
if (media_type.value() == MediaQuery::MediaType::Unknown)
return invalid_media_query();
media_query->m_media_type = media_type.value();
media_query->m_media_type = media_type.release_value();
tokens.discard_whitespace();
} else {
// https://drafts.csswg.org/mediaqueries-4/#error-handling
// A media query that does not match the grammar in the previous section must be replaced by not all during parsing.
return invalid_media_query();
}
@ -415,10 +413,19 @@ Optional<MediaQuery::MediaType> Parser::parse_media_type(TokenStream<ComponentVa
if (!token.is(Token::Type::Ident))
return {};
// https://drafts.csswg.org/mediaqueries-3/#error-handling
// "However, an exception is made for media types ‘layer’, ‘not’, ‘and’, ‘only’, and ‘or’. Even though they do match
// the IDENT production, they must not be treated as unknown media types, but rather trigger the malformed query clause."
if (token.is_ident("layer"sv) || token.is_ident("not"sv) || token.is_ident("and"sv) || token.is_ident("only"sv) || token.is_ident("or"sv))
return {};
transaction.commit();
auto ident = token.token().ident();
return media_type_from_string(ident);
auto const& ident = token.token().ident();
return MediaQuery::MediaType {
.name = ident,
.known_type = media_type_from_string(ident),
};
}
// `<mf-value>`, https://www.w3.org/TR/mediaqueries-4/#typedef-mf-value