diff --git a/components/style/media_queries.rs b/components/style/media_queries.rs
index fea6811ffc2..e9336515e9c 100644
--- a/components/style/media_queries.rs
+++ b/components/style/media_queries.rs
@@ -243,19 +243,13 @@ pub fn parse_media_query_list(input: &mut Parser) -> MediaList {
}
let mut media_queries = vec![];
- let mut found_invalid = false;
loop {
match input.parse_until_before(Delimiter::Comma, MediaQuery::parse) {
- Ok(mq) => if !found_invalid {
+ Ok(mq) => {
media_queries.push(mq);
},
- Err(..) => if !found_invalid {
- media_queries.clear();
+ Err(..) => {
media_queries.push(MediaQuery::never_matching());
- // Consume the rest of the input as if they were valid
- // expressions (they might be, they might not), but ignore the
- // result, this allows correctly parsing invalid media queries.
- found_invalid = true;
},
}
@@ -266,8 +260,6 @@ pub fn parse_media_query_list(input: &mut Parser) -> MediaList {
}
}
- debug_assert!(!found_invalid || media_queries.len() == 1);
-
MediaList {
media_queries: media_queries,
}
diff --git a/tests/unit/style/media_queries.rs b/tests/unit/style/media_queries.rs
index 4d3cf9e98a2..95182676e3c 100644
--- a/tests/unit/style/media_queries.rs
+++ b/tests/unit/style/media_queries.rs
@@ -321,11 +321,12 @@ fn test_mq_multiple_expressions() {
#[test]
fn test_mq_malformed_expressions() {
fn check_malformed_expr(list: &MediaList, css: &str) {
- assert!(list.media_queries.len() == 1, css.to_owned());
- let q = &list.media_queries[0];
- assert!(q.qualifier == Some(Qualifier::Not), css.to_owned());
- assert!(q.media_type == MediaQueryType::All, css.to_owned());
- assert!(q.expressions.len() == 0, css.to_owned());
+ assert!(!list.media_queries.is_empty(), css.to_owned());
+ for mq in &list.media_queries {
+ assert!(mq.qualifier == Some(Qualifier::Not), css.to_owned());
+ assert!(mq.media_type == MediaQueryType::All, css.to_owned());
+ assert!(mq.expressions.is_empty(), css.to_owned());
+ }
}
for rule in &[
@@ -335,8 +336,6 @@ fn test_mq_malformed_expressions() {
"@media not {}",
"@media not (min-width: 300px) {}",
"@media , {}",
- "@media screen 4px, print {}",
- "@media screen, {}",
] {
test_media_rule(rule, check_malformed_expr);
}
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 65472be2d67..366654cac25 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -11066,6 +11066,12 @@
{}
]
],
+ "css/media_bogus_query_sequence.html": [
+ [
+ "/_mozilla/css/media_bogus_query_sequence.html",
+ {}
+ ]
+ ],
"css/media_calc_crash.html": [
[
"/_mozilla/css/media_calc_crash.html",
@@ -22295,6 +22301,10 @@
"477c77a8ca848cf57b440ea7d74cc0edc97aa2cb",
"support"
],
+ "css/media_bogus_query_sequence.html": [
+ "88fb8ef33c4870966a1691f1dd992362ebe5f24e",
+ "testharness"
+ ],
"css/media_calc_crash.html": [
"14034fed9727ceb0c17b17b33fbc1552bc7c949e",
"testharness"
diff --git a/tests/wpt/mozilla/tests/css/media_bogus_query_sequence.html b/tests/wpt/mozilla/tests/css/media_bogus_query_sequence.html
new file mode 100644
index 00000000000..a112a316eab
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/media_bogus_query_sequence.html
@@ -0,0 +1,16 @@
+
+
+CSS Test: Media query with a bogus query doesn't turn the whole media query list invalid.
+
+
+
+
+