Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WebKit export of https://bugs.webkit.org/show_bug.cgi?id=258688 #41409

Merged
merged 1 commit into from
Aug 16, 2023
Merged

WebKit export of https://bugs.webkit.org/show_bug.cgi?id=258688 #41409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions css/css-nesting/nest-containing-forgiving-ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
<body>
<p>Tests pass if <strong>block is green</strong></p>
<div class="test"></div>
<div class="test"></div>
</body>
7 changes: 7 additions & 0 deletions css/css-nesting/nest-containing-forgiving.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,18 @@
}
}

.does-not-exist {
:is(.test-2, :unknown(div,&)) {
background-color: green;
}
}

body * + * {
margin-top: 8px;
}
</style>
<body>
<p>Tests pass if <strong>block is green</strong></p>
<div class="test test-1"></div>
<div class="test test-2"></div>
</body>
8 changes: 4 additions & 4 deletions css/css-scoping/slotted-parsing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
test_valid_selector("::slotted(:not(.a))");

test_valid_selector("::slotted(*):is()");
test_valid_selector("::slotted(*):is(:hover)", "::slotted(*):is()");
test_valid_selector("::slotted(*):is(#id)", "::slotted(*):is()");
test_valid_selector("::slotted(*):is(:hover)");
test_valid_selector("::slotted(*):is(#id)");

test_valid_selector("::slotted(*):where()");
test_valid_selector("::slotted(*):where(:hover)", "::slotted(*):where()");
test_valid_selector("::slotted(*):where(#id)", "::slotted(*):where()");
test_valid_selector("::slotted(*):where(:hover)");
test_valid_selector("::slotted(*):where(#id)");

// Allow tree-abiding pseudo elements after ::slotted
test_valid_selector("::slotted(*)::before");
Expand Down
16 changes: 5 additions & 11 deletions css/selectors/is-where-error-recovery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,12 @@
"random-selector",
"Should've parsed",
);
assert_not_equals(
rule.selectorText,
invalidSelector,
"Should not be considered valid and parsed as-is",
);
let emptyList = `:${pseudo}()`;
assert_equals(
rule.selectorText,
emptyList,
"Should be serialized as an empty selector-list",
invalidSelector,
"Should be parsed as-is (but not be considered valid)",
);
assert_equals(document.querySelector(emptyList), null, "Should never match, but should parse");
assert_equals(document.querySelector(rule.selectorText), null, "Should never match, but should parse");
for (let mixedList of [
`:${pseudo}(:total-nonsense, #test-div)`,
`:${pseudo}(:total-nonsense and-more-stuff, #test-div)`,
Expand All @@ -43,8 +37,8 @@
rule.selectorText = mixedList;
assert_equals(
rule.selectorText,
`:${pseudo}(#test-div)`,
`${mixedList}: Should ignore invalid selectors`,
mixedList,
`${mixedList}: Should parse invalid selectors`,
);
let testDiv = document.getElementById("test-div");
assert_equals(document.querySelector(mixedList), testDiv, "Should correctly match");
Expand Down
7 changes: 4 additions & 3 deletions css/selectors/is-where-parsing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</style>
<script>
let rule = document.getElementById("test-sheet").sheet.cssRules[0];
function assert_valid(expected_valid, pattern, expected_pattern, description) {
function assert_valid(expected_parseable, pattern, expected_pattern, description) {
test(function() {
for (let pseudo of ["is", "where"]) {
let selector = pattern.replace("{}", ":" + pseudo);
Expand All @@ -19,7 +19,7 @@
expected_selector = expected_pattern.replace("{}", ":" + pseudo);
rule.selectorText = "random-selector";
rule.selectorText = selector;
(expected_valid ? assert_equals : assert_not_equals)(
(expected_parseable ? assert_equals : assert_not_equals)(
rule.selectorText,
expected_selector,
`${description}: ${selector}`
Expand All @@ -42,7 +42,8 @@
assert_valid(true, "{}(:hover, :active)", null, "Pseudo-classes inside");
assert_valid(true, "{}(div):hover", null, "Pseudo-classes after");
assert_valid(true, "{}(div)::before", null, "Pseudo-elements after");
assert_valid(false, "{}(::before)", null, "Pseudo-elements inside");
// Should ask clarification from CSSWG
assert_valid(true, "{}(::before)", null, "Pseudo-elements inside");

assert_valid(true, "{}(div) + bar", null, "Combinators after");
assert_valid(true, "::part(foo):is(:hover)", null, "After part with simple pseudo-class");
Expand Down
4 changes: 2 additions & 2 deletions css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<script src="/css/support/parsing-testcommon.js"></script>
<script>
test_invalid_selector('.a:has(.b:has(.c))');
test_valid_selector('.a:has(:is(.b:has(.c)))', '.a:has(:is())');
test_valid_selector('.a:has(:is(.b:has(.c), .d))', '.a:has(:is(.d))');
test_valid_selector('.a:has(:is(.b:has(.c)))');
test_valid_selector('.a:has(:is(.b:has(.c), .d))');
</script>
2 changes: 1 addition & 1 deletion css/selectors/parsing/parse-has.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
test_invalid_selector(':has()');
test_invalid_selector(':has(123)');
test_invalid_selector(':has(.a, 123)');
test_valid_selector(':has(:is(.a, 123))', ':has(:is(.a))');
test_valid_selector(':has(:is(.a, 123))');
</script>