Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

13 files changed, 50 insertions, 193 deletions

diff --git a/testing/web-platform/meta/css/css-cascade/__dir__.ini b/testing/web-platform/meta/css/css-cascade/__dir__.ini
index 221167417d..8a09ade22f 100644
--- a/testing/web-platform/meta/css/css-cascade/__dir__.ini
+++ b/testing/web-platform/meta/css/css-cascade/__dir__.ini
@@ -1 +1 @@
-prefs: [layout.css.import-supports.enabled:true, layout.css.properties-and-values.enabled:true]
+prefs: [layout.css.import-supports.enabled:true, layout.css.properties-and-values.enabled:true, layout.css.at-scope.enabled:true]
diff --git a/testing/web-platform/meta/css/css-cascade/at-scope-parsing.html.ini b/testing/web-platform/meta/css/css-cascade/at-scope-parsing.html.ini
deleted file mode 100644
index dd3a35e95f..0000000000
--- a/testing/web-platform/meta/css/css-cascade/at-scope-parsing.html.ini
+++ /dev/null
@@ -1,80 +0,0 @@
-[at-scope-parsing.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
-  [@scope (.a) is valid]
-    expected: FAIL
-
-  [@scope (.a + .b) is valid]
-    expected: FAIL
-
-  [@scope (.a:hover) is valid]
-    expected: FAIL
-
-  [@scope (.a:hover, #b, div) is valid]
-    expected: FAIL
-
-  [@scope (:is(div, span)) is valid]
-    expected: FAIL
-
-  [@scope (.a) to (.b) is valid]
-    expected: FAIL
-
-  [@scope (.a)to (.b) is valid]
-    expected: FAIL
-
-  [@scope (.a) to (.b:hover, #c, div) is valid]
-    expected: FAIL
-
-  [@scope (.c <> .d) is valid]
-    expected: FAIL
-
-  [@scope (.a, .c <> .d) is valid]
-    expected: FAIL
-
-  [@scope (.a <> .b, .c) is valid]
-    expected: FAIL
-
-  [@scope (div::before) is valid]
-    expected: FAIL
-
-  [@scope (div::after) is valid]
-    expected: FAIL
-
-  [@scope (slotted(div)) is valid]
-    expected: FAIL
-
-  [@scope (.a) to (div::before) is valid]
-    expected: FAIL
-
-  [@scope is valid]
-    expected: FAIL
-
-  [@scope (.a) to (&) is valid]
-    expected: FAIL
-
-  [@scope (.a) to (& > &) is valid]
-    expected: FAIL
-
-  [@scope (.a) to (> .b) is valid]
-    expected: FAIL
-
-  [@scope (.a) to (+ .b) is valid]
-    expected: FAIL
-
-  [@scope (.a) to (~ .b) is valid]
-    expected: FAIL
-
-  [@scope to (.a) is valid]
-    expected: FAIL
-
-  [@scope (> &) to (>>) is valid]
-    expected: FAIL
-
-  [@scope () is valid]
-    expected: FAIL
-
-  [@scope to () is valid]
-    expected: FAIL
-
-  [@scope () to () is valid]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/at-scope-relative-syntax.html.ini b/testing/web-platform/meta/css/css-cascade/at-scope-relative-syntax.html.ini
new file mode 100644
index 0000000000..8730cd328b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-cascade/at-scope-relative-syntax.html.ini
@@ -0,0 +1,16 @@
+[at-scope-relative-syntax.html]
+  [> .foo in .nest,@scope created by string valid]
+    expected:
+      if (os == "mac") and not debug: [PASS, FAIL]
+
+  [> .foo in .nest,@scope,@media screen created by string valid]
+    expected:
+      if (os == "mac") and not debug: [PASS, FAIL]
+
+  [> .foo in .nest,@scope created by insertRule valid]
+    expected:
+      if (os == "mac") and not debug: [PASS, FAIL]
+
+  [> .foo in .nest,@scope,@media screen created by insertRule valid]
+    expected:
+      if (os == "mac") and not debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/css/css-cascade/idlharness.html.ini b/testing/web-platform/meta/css/css-cascade/idlharness.html.ini
deleted file mode 100644
index cd50fa8256..0000000000
--- a/testing/web-platform/meta/css/css-cascade/idlharness.html.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-[idlharness.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
-  [CSSScopeRule interface: existence and properties of interface object]
-    expected: FAIL
-
-  [CSSScopeRule interface object length]
-    expected: FAIL
-
-  [CSSScopeRule interface object name]
-    expected: FAIL
-
-  [CSSScopeRule interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [CSSScopeRule interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [CSSScopeRule interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [CSSScopeRule interface: attribute start]
-    expected: FAIL
-
-  [CSSScopeRule interface: attribute end]
-    expected: FAIL
-
-  [Stringification of scope]
-    expected: FAIL
-
-  [CSSScopeRule interface: scope must inherit property "start" with the proper type]
-    expected: FAIL
-
-  [CSSScopeRule interface: scope must inherit property "end" with the proper type]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-cssom.html.ini b/testing/web-platform/meta/css/css-cascade/scope-cssom.html.ini
deleted file mode 100644
index 510a64990d..0000000000
--- a/testing/web-platform/meta/css/css-cascade/scope-cssom.html.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-[scope-cssom.html]
-  [CSSScopeRule.cssText, implicit scope]
-    expected: FAIL
-
-  [CSSScopeRule.cssText, root only]
-    expected: FAIL
-
-  [CSSScopeRule.cssText, root and limit]
-    expected: FAIL
-
-  [CSSScopeRule.cssText, limit only]
-    expected: FAIL
-
-  [CSSScopeRule.start, implicit scope]
-    expected: FAIL
-
-  [CSSScopeRule.start, root only]
-    expected: FAIL
-
-  [CSSScopeRule.start, root and limit]
-    expected: FAIL
-
-  [CSSScopeRule.start, limit only]
-    expected: FAIL
-
-  [CSSScopeRule.end, implicit scope]
-    expected: FAIL
-
-  [CSSScopeRule.end, root only]
-    expected: FAIL
-
-  [CSSScopeRule.end, root and limit]
-    expected: FAIL
-
-  [CSSScopeRule.end, limit only]
-    expected: FAIL
-
-  [CSSScopeRule is a CSSGroupingRule]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-deep.html.ini b/testing/web-platform/meta/css/css-cascade/scope-deep.html.ini
deleted file mode 100644
index 3968ff3a8b..0000000000
--- a/testing/web-platform/meta/css/css-cascade/scope-deep.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[scope-deep.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
-  [Deep @scope nesting]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-evaluation.html.ini b/testing/web-platform/meta/css/css-cascade/scope-evaluation.html.ini
index 1768b21bb4..e919bb2c65 100644
--- a/testing/web-platform/meta/css/css-cascade/scope-evaluation.html.ini
+++ b/testing/web-platform/meta/css/css-cascade/scope-evaluation.html.ini
@@ -17,9 +17,6 @@
   [Inner @scope with :scope in from-selector]
     expected: FAIL
 
-  [Multiple scopes from same @scope-rule, only one limited]
-    expected: FAIL
-
   [Nested scopes]
     expected: FAIL
 
@@ -43,3 +40,18 @@
 
   [Scope root with :has()]
     expected: FAIL
+
+  [Scope can not match its own root without :scope]
+    expected: FAIL
+
+  [Multiple scopes from same @scope-rule, both limited]
+    expected: FAIL
+
+  [Nested scopes, reverse]
+    expected: FAIL
+
+  [Scope with no elements]
+    expected: FAIL
+
+  [Any scope limit makes the element out of scope]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-implicit.html.ini b/testing/web-platform/meta/css/css-cascade/scope-implicit.html.ini
index dc73a3cb37..16f737e74a 100644
--- a/testing/web-platform/meta/css/css-cascade/scope-implicit.html.ini
+++ b/testing/web-platform/meta/css/css-cascade/scope-implicit.html.ini
@@ -16,3 +16,12 @@
 
   [Implicit @scope with limit]
     expected: FAIL
+
+  [@scope with effectively empty :is() must not match anything]
+    expected: FAIL
+
+  [Implicit @scope has implicitly added :scope descendant combinator]
+    expected: FAIL
+
+  [Proximity calculation of multiple implicit @scope]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-name-defining-rules.html.ini b/testing/web-platform/meta/css/css-cascade/scope-name-defining-rules.html.ini
deleted file mode 100644
index a5ef978d27..0000000000
--- a/testing/web-platform/meta/css/css-cascade/scope-name-defining-rules.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[scope-name-defining-rules.html]
-  [@keyframes is unaffected by @scope]
-    expected: FAIL
-
-  [@keyframes is unaffected by non-matching @scope]
-    expected: FAIL
-
-  [@property is unaffected by @scope]
-    expected: FAIL
-
-  [@property is unaffected by non-matching @scope]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-nesting.html.ini b/testing/web-platform/meta/css/css-cascade/scope-nesting.html.ini
index 0d535cd082..ff29779326 100644
--- a/testing/web-platform/meta/css/css-cascade/scope-nesting.html.ini
+++ b/testing/web-platform/meta/css/css-cascade/scope-nesting.html.ini
@@ -46,3 +46,6 @@
 
   [Scoped nested group rule]
     expected: FAIL
+
+  [Nesting-selector in <scope-end>]
+    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-proximity.html.ini b/testing/web-platform/meta/css/css-cascade/scope-proximity.html.ini
index 2e16da28b1..33bb292b80 100644
--- a/testing/web-platform/meta/css/css-cascade/scope-proximity.html.ini
+++ b/testing/web-platform/meta/css/css-cascade/scope-proximity.html.ini
@@ -6,6 +6,3 @@
 
   [Proximity wins over order of appearance]
     expected: FAIL
-
-  [Specificity wins over proximity]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/scope-shadow.tentative.html.ini b/testing/web-platform/meta/css/css-cascade/scope-shadow.tentative.html.ini
index bf47d2b4f7..088f046448 100644
--- a/testing/web-platform/meta/css/css-cascade/scope-shadow.tentative.html.ini
+++ b/testing/web-platform/meta/css/css-cascade/scope-shadow.tentative.html.ini
@@ -1,7 +1,4 @@
 [scope-shadow.tentative.html]
-  [@scope can match :host]
-    expected: FAIL
-
   [@scope can match :host(...)]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/css/css-cascade/scope-visited-cssom.html.ini b/testing/web-platform/meta/css/css-cascade/scope-visited-cssom.html.ini
index beda7272c7..c73271a9e8 100644
--- a/testing/web-platform/meta/css/css-cascade/scope-visited-cssom.html.ini
+++ b/testing/web-platform/meta/css/css-cascade/scope-visited-cssom.html.ini
@@ -1,16 +1,4 @@
 [scope-visited-cssom.html]
-  [:link as scoped selector]
-    expected: FAIL
-
-  [:not(:visited) as scoped selector]
-    expected: FAIL
-
-  [:link as scoping root]
-    expected: FAIL
-
-  [:not(:visited) as scoping root]
-    expected: FAIL
-
   [:link as scoping root, :scope]
     expected: FAIL
 
@@ -22,3 +10,9 @@
 
   [:not(:link) as scoping limit]
     expected: FAIL
+
+  [:visited as scoping root]
+    expected: FAIL
+
+  [:not(:link) as scoping root]
+    expected: FAIL