Skip to content

Commit 6cb0400

Browse files
committed
[MQ4] "layer" is invalid as media type name
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
1 parent d9cd0e7 commit 6cb0400

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

LayoutTests/TestExpectations

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4708,7 +4708,6 @@ webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/intrinsic-per
47084708
webkit.org/b/214464 imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-thickness-fixed.html [ ImageOnlyFailure ]
47094709
webkit.org/b/214464 imported/w3c/web-platform-tests/css/css-text-decor/text-decoration-thickness-ink-skip-dilation.html [ ImageOnlyFailure ]
47104710

4711-
webkit.org/b/214465 imported/w3c/web-platform-tests/css/mediaqueries/mq-invalid-media-type-layer-001.html [ ImageOnlyFailure ]
47124711
webkit.org/b/214465 imported/w3c/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image.html [ ImageOnlyFailure ]
47134712
webkit.org/b/214465 imported/w3c/web-platform-tests/css/mediaqueries/prefers-color-scheme-svg-image-normal-with-meta-dark.html [ ImageOnlyFailure ]
47144713

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

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
33

Source/WebCore/css/query/MediaQueryParser.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,11 @@ std::optional<MediaQuery> MediaQueryParser::consumeMediaQuery(CSSParserTokenRang
143143
if (identifier == CSSValueOnly || identifier == CSSValueNot || identifier == CSSValueAnd || identifier == CSSValueOr)
144144
return { };
145145

146-
return range.consumeIncludingWhitespace().value().convertToASCIILowercaseAtom();
146+
auto mediaType = range.consumeIncludingWhitespace().value().convertToASCIILowercaseAtom();
147+
if (mediaType == "layer"_s)
148+
return { };
149+
150+
return mediaType;
147151
};
148152

149153
auto prefix = consumePrefix();

0 commit comments

Comments
 (0)