diff --git a/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp b/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp index 2e25c02d23..651fcb93f9 100644 --- a/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp +++ b/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp @@ -350,6 +350,8 @@ bool MediaQuery::evaluate(HTML::Window const& window) case MediaType::Screen: // FIXME: Disable for printing, when we have printing! return MatchResult::True; + case MediaType::Unknown: + return MatchResult::False; // Deprecated, must never match: case MediaType::TTY: case MediaType::TV: @@ -444,7 +446,7 @@ bool is_media_feature_name(StringView name) return false; } -Optional media_type_from_string(StringView name) +MediaQuery::MediaType media_type_from_string(StringView name) { if (name.equals_ignoring_case("all"sv)) return MediaQuery::MediaType::All; @@ -468,7 +470,7 @@ Optional media_type_from_string(StringView name) return MediaQuery::MediaType::TTY; if (name.equals_ignoring_case("tv"sv)) return MediaQuery::MediaType::TV; - return {}; + return MediaQuery::MediaType::Unknown; } StringView to_string(MediaQuery::MediaType media_type) @@ -496,6 +498,8 @@ StringView to_string(MediaQuery::MediaType media_type) return "tty"sv; case MediaQuery::MediaType::TV: return "tv"sv; + case MediaQuery::MediaType::Unknown: + return "unknown"sv; } VERIFY_NOT_REACHED(); } diff --git a/Userland/Libraries/LibWeb/CSS/MediaQuery.h b/Userland/Libraries/LibWeb/CSS/MediaQuery.h index c66a351dff..51cc7b6f03 100644 --- a/Userland/Libraries/LibWeb/CSS/MediaQuery.h +++ b/Userland/Libraries/LibWeb/CSS/MediaQuery.h @@ -223,6 +223,7 @@ public: All, Print, Screen, + Unknown, // Deprecated, must never match: TTY, @@ -258,7 +259,7 @@ String serialize_a_media_query_list(NonnullRefPtrVector const&); bool is_media_feature_name(StringView name); -Optional media_type_from_string(StringView); +MediaQuery::MediaType media_type_from_string(StringView); StringView to_string(MediaQuery::MediaType); } diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 5ad61a7ae3..e852f28fb8 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -1142,13 +1142,10 @@ Optional Parser::parse_media_type(TokenStream`, https://www.w3.org/TR/mediaqueries-4/#typedef-media-in-parens