[MQ4] "layer" is invalid as media type name

anttijk · anttijk · commit 6cb0400c49f7 · 2023-01-16T09:34:55.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=250677 rdar://104297917 Reviewed by Sam Weinig. * LayoutTests/TestExpectations: * LayoutTests/imported/w3c/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-002-expected.txt: * Source/WebCore/css/query/MediaQueryParser.cpp: (WebCore::MQ::MediaQueryParser::consumeMediaQuery): Canonical link: https://commits.webkit.org/258957@main
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
@@ -4708,7 +4708,6 @@ webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/intrinsic-per
 webkit.org/b/214464 imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-thickness-fixed.html [ ImageOnlyFailure ]
 webkit.org/b/214464 imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-thickness-ink-skip-dilation.html [ ImageOnlyFailure ]
 
-webkit.org/b/214465 imported/w3c/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-001.html [ ImageOnlyFailure ]
 webkit.org/b/214465 imported/w3c/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image.html [ ImageOnlyFailure ]
 webkit.org/b/214465 imported/w3c/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark.html [ ImageOnlyFailure ]
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-002-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-002-expected.txt
@@ -1,3 +1,3 @@
 
-FAIL 'layer' used as media types is a syntax error assert_equals: expected "not all" but got "not layer"
+PASS 'layer' used as media types is a syntax error
 
diff --git a/Source/WebCore/css/query/MediaQueryParser.cpp b/Source/WebCore/css/query/MediaQueryParser.cpp
@@ -143,7 +143,11 @@ std::optional<MediaQuery> MediaQueryParser::consumeMediaQuery(CSSParserTokenRang
         if (identifier == CSSValueOnly || identifier == CSSValueNot || identifier == CSSValueAnd || identifier == CSSValueOr)
             return { };
 
-        return range.consumeIncludingWhitespace().value().convertToASCIILowercaseAtom();
+        auto mediaType = range.consumeIncludingWhitespace().value().convertToASCIILowercaseAtom();
+        if (mediaType == "layer"_s)
+            return { };
+        
+        return mediaType;
     };
 
     auto prefix = consumePrefix();

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`
`2`		`-FAIL 'layer' used as media types is a syntax error assert_equals: expected "not all" but got "not layer"`
	`2`	`+PASS 'layer' used as media types is a syntax error`
`3`	`3`