From e70da52026c433c734b089428cf7147db51c5be0 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim@apple.com>
Date: Fri, 13 Jan 2023 19:34:48 -0800
Subject: [PATCH] Move :dir()/:lang() pseudo-class tests to WPT
 https://bugs.webkit.org/show_bug.cgi?id=250602 rdar://104245215

Reviewed by Simon Fraser.

They're useful tests, and it would be nice to have for Interop 2023.

- Renamed the tests to match naming in respective folders
- Use the common ref-filled-green-100px-square.xht upstream file in <link rel="match"> to avoid duplication
- Used testharness.js for some :lang() tests.
- Also moved 2 :lang() tests that were in css/css-pseudo into css/selectors

* LayoutTests/fast/css/dir-pseudo-container-query-expected.html: Removed.
* LayoutTests/fast/css/dir-pseudo-container-query-invalidation-expected.html: Removed.
* LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation-expected.html: Removed.
* LayoutTests/fast/css/lang-pseudo-container-query-invalidation-expected.html: Removed.
* LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml-expected.html: Removed.
* LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation-expected.html: Removed.
* LayoutTests/fast/css/lang-pseudo-disconnected-expected.txt: Removed.
* LayoutTests/fast/css/lang-pseudo-disconnected.html: Removed.
* LayoutTests/fast/css/lang-selector-empty-attribute-expected.txt: Removed.
* LayoutTests/fast/css/lang-selector-empty-attribute.xhtml: Removed.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has-expected.xht: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has.html: Renamed from LayoutTests/fast/css/dir-pseudo-container-query.html.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-expected.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries-expected.html.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-ref.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries-ref.html.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries.html.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected.html: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has-expected.xht: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has.html: Renamed from LayoutTests/fast/css/dir-pseudo-container-query-invalidation.html.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element-expected.xht: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html: Renamed from LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation.html.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-expected.xht: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements-expected.xht: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html: Renamed from LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation.html.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml-expected.xht: Added.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml: Renamed from LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml.xhtml.
* LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has.html: Renamed from LayoutTests/fast/css/lang-pseudo-container-query-invalidation.html.

Canonical link: https://commits.webkit.org/258903@main
---
 .../dir-pseudo-container-query-expected.html  |  6 ---
 ...container-query-invalidation-expected.html |  6 ---
 ...ocument-element-invalidation-expected.html |  6 ---
 ...container-query-invalidation-expected.html |  6 ---
 ...ner-query-invalidation-xhtml-expected.html |  6 ---
 ...cument-elements-invalidation-expected.html |  6 ---
 .../css/lang-pseudo-disconnected-expected.txt | 13 ------
 .../fast/css/lang-pseudo-disconnected.html    | 20 ---------
 ...lang-selector-empty-attribute-expected.txt |  3 --
 .../css/lang-selector-empty-attribute.xhtml   | 44 -------------------
 .../selectors/dir-pseudo-in-has-expected.xht  | 19 ++++++++
 .../css/selectors/dir-pseudo-in-has.html}     |  7 +++
 ...ass-across-shadow-boundaries-expected.html |  0
 ...do-class-across-shadow-boundaries-ref.html |  0
 ...pseudo-class-across-shadow-boundaries.html |  0
 ...ang-pseudo-class-disconnected-expected.txt |  3 ++
 .../i18n/lang-pseudo-class-disconnected.html  | 24 ++++++++++
 ...-pseudo-class-empty-attribute-expected.txt |  5 +++
 .../lang-pseudo-class-empty-attribute.xhtml   | 26 +++++++++++
 .../dir-pseudo-class-in-has-expected.xht      | 19 ++++++++
 .../dir-pseudo-class-in-has.html}             |  7 +++
 ...class-in-has-document-element-expected.xht | 19 ++++++++
 ...pseudo-class-in-has-document-element.html} |  7 ++-
 .../lang-pseudo-class-in-has-expected.xht     | 19 ++++++++
 ...as-multiple-document-elements-expected.xht | 19 ++++++++
 ...ss-in-has-multiple-document-elements.html} | 13 ++++--
 ...ang-pseudo-class-in-has-xhtml-expected.xht | 19 ++++++++
 .../lang-pseudo-class-in-has-xhtml.xhtml}     |  9 +++-
 .../lang-pseudo-class-in-has.html}            |  7 +++
 29 files changed, 217 insertions(+), 121 deletions(-)
 delete mode 100644 LayoutTests/fast/css/dir-pseudo-container-query-expected.html
 delete mode 100644 LayoutTests/fast/css/dir-pseudo-container-query-invalidation-expected.html
 delete mode 100644 LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation-expected.html
 delete mode 100644 LayoutTests/fast/css/lang-pseudo-container-query-invalidation-expected.html
 delete mode 100644 LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml-expected.html
 delete mode 100644 LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation-expected.html
 delete mode 100644 LayoutTests/fast/css/lang-pseudo-disconnected-expected.txt
 delete mode 100644 LayoutTests/fast/css/lang-pseudo-disconnected.html
 delete mode 100644 LayoutTests/fast/css/lang-selector-empty-attribute-expected.txt
 delete mode 100644 LayoutTests/fast/css/lang-selector-empty-attribute.xhtml
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has-expected.xht
 rename LayoutTests/{fast/css/dir-pseudo-container-query.html => imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has.html} (63%)
 rename LayoutTests/imported/w3c/web-platform-tests/css/{css-pseudo => selectors/i18n}/lang-pseudo-class-across-shadow-boundaries-expected.html (100%)
 rename LayoutTests/imported/w3c/web-platform-tests/css/{css-pseudo => selectors/i18n}/lang-pseudo-class-across-shadow-boundaries-ref.html (100%)
 rename LayoutTests/imported/w3c/web-platform-tests/css/{css-pseudo => selectors/i18n}/lang-pseudo-class-across-shadow-boundaries.html (100%)
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected-expected.txt
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected.html
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute-expected.txt
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has-expected.xht
 rename LayoutTests/{fast/css/dir-pseudo-container-query-invalidation.html => imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has.html} (72%)
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element-expected.xht
 rename LayoutTests/{fast/css/lang-pseudo-container-query-document-element-invalidation.html => imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html} (53%)
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-expected.xht
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements-expected.xht
 rename LayoutTests/{fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation.html => imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html} (53%)
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml-expected.xht
 rename LayoutTests/{fast/css/lang-pseudo-container-query-invalidation-xhtml.xhtml => imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml} (80%)
 rename LayoutTests/{fast/css/lang-pseudo-container-query-invalidation.html => imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has.html} (74%)

diff --git a/LayoutTests/fast/css/dir-pseudo-container-query-expected.html b/LayoutTests/fast/css/dir-pseudo-container-query-expected.html
deleted file mode 100644
index d86fd234ca32..000000000000
--- a/LayoutTests/fast/css/dir-pseudo-container-query-expected.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="width: 100px; height: 100px; background: green;"></div>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/dir-pseudo-container-query-invalidation-expected.html b/LayoutTests/fast/css/dir-pseudo-container-query-invalidation-expected.html
deleted file mode 100644
index d86fd234ca32..000000000000
--- a/LayoutTests/fast/css/dir-pseudo-container-query-invalidation-expected.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="width: 100px; height: 100px; background: green;"></div>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation-expected.html b/LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation-expected.html
deleted file mode 100644
index 23e48929c77c..000000000000
--- a/LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation-expected.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="width: 100px; height: 100px; background-color: green;"></div>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-expected.html b/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-expected.html
deleted file mode 100644
index 23e48929c77c..000000000000
--- a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-expected.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="width: 100px; height: 100px; background-color: green;"></div>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml-expected.html b/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml-expected.html
deleted file mode 100644
index 23e48929c77c..000000000000
--- a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml-expected.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="width: 100px; height: 100px; background-color: green;"></div>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation-expected.html b/LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation-expected.html
deleted file mode 100644
index 23e48929c77c..000000000000
--- a/LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation-expected.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="width: 100px; height: 100px; background-color: green;"></div>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-disconnected-expected.txt b/LayoutTests/fast/css/lang-pseudo-disconnected-expected.txt
deleted file mode 100644
index f89f1926d5d3..000000000000
--- a/LayoutTests/fast/css/lang-pseudo-disconnected-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-:lang pseudo class should work in a disconnected subtree
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS target.matches(":lang(zh)") is true
-PASS target.parentNode.remove(); target.matches(":lang(zh)") is true
-PASS target.matches(":lang(fr)") is true
-PASS document.body.append(target.parentNode); target.matches(":lang(fr)") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/css/lang-pseudo-disconnected.html b/LayoutTests/fast/css/lang-pseudo-disconnected.html
deleted file mode 100644
index 1ab85fa9fe2a..000000000000
--- a/LayoutTests/fast/css/lang-pseudo-disconnected.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div id="container" lang="zh"><span></span></div>
-<script src="../../resources/js-test.js"></script>
-<script>
-description(':lang pseudo class should work in a disconnected subtree');
-let target = container.querySelector('span');
-shouldBeTrue('target.matches(":lang(zh)")');
-shouldBeTrue('target.parentNode.remove(); target.matches(":lang(zh)")');
-
-const anotherContainer = document.createElement('div');
-anotherContainer.innerHTML = '<div lang="fr"><span></span></div>';
-target = anotherContainer.querySelector('span');
-shouldBeTrue('target.matches(":lang(fr)")');
-shouldBeTrue('document.body.append(target.parentNode); target.matches(":lang(fr)")');
-
-</script>
-</body>
-</html>
diff --git a/LayoutTests/fast/css/lang-selector-empty-attribute-expected.txt b/LayoutTests/fast/css/lang-selector-empty-attribute-expected.txt
deleted file mode 100644
index 190e781f6957..000000000000
--- a/LayoutTests/fast/css/lang-selector-empty-attribute-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Tests if empty language declarations are supported
-
-SUCCESS
diff --git a/LayoutTests/fast/css/lang-selector-empty-attribute.xhtml b/LayoutTests/fast/css/lang-selector-empty-attribute.xhtml
deleted file mode 100644
index b4bd38e460af..000000000000
--- a/LayoutTests/fast/css/lang-selector-empty-attribute.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <style type="text/css">
-      span {background: white;display:none}
-      span:lang(de) {background: red}
-    </style>
-    <script>
-      function log(message) {
-        document.getElementById("console").innerHTML += message;
-      }
-
-      function test() {
-        if (window.testRunner)
-            testRunner.dumpAsText();
-
-        var i = document.getElementById("emptyLang");
-        if (document.defaultView.getComputedStyle(i, null).getPropertyValue('background-color') != "rgb(255, 255, 255)") {
-            log("FAILURE");
-            return;
-        }
-        var i2 = document.getElementById("emptyXmlLang");
-        if (document.defaultView.getComputedStyle(i2, null).getPropertyValue('background-color') != "rgb(255, 255, 255)") {
-            log("FAILURE");
-            return;
-       }
-        var i3 = document.getElementById("noLang");
-        if (document.defaultView.getComputedStyle(i3, null).getPropertyValue('background-color') != "rgb(255, 0, 0)") {
-            log("FAILURE");
-            return;
-        }
-        log("SUCCESS");
-      }
-    </script>
-  </head>
-  <body onload="test()">
-    <p>Tests if empty language declarations are supported</p>
-    <p xml:lang="de">
-      <span lang="" id="emptyLang"/>
-      <span xml:lang="" id="emptyXmlLang"/>
-      <span id="noLang"/>
-    </p>
-    <div id="console"></div>
-  </body>
-</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has-expected.xht
new file mode 100644
index 000000000000..05a13794482a
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has-expected.xht
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div></div>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/dir-pseudo-container-query.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has.html
similarity index 63%
rename from LayoutTests/fast/css/dir-pseudo-container-query.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has.html
index 7538c974c3a2..3a3a0757a58b 100644
--- a/LayoutTests/fast/css/dir-pseudo-container-query.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/dir-pseudo-in-has.html
@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html>
+<head>
+    <link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#relational"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#dir-pseudo"/>
+    <link rel="match" href="../reference/ref-filled-green-100px-square.xht"/>
+</head>
 <body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
     <section><div class="ltr"><span></span></div></section>
     <section><div dir="ltr" class="ltr"><span></span></div></section>
     <section dir="ltr"><div class="ltr"><span></span></div></section>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-expected.html
similarity index 100%
rename from LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries-expected.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-expected.html
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries-ref.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-ref.html
similarity index 100%
rename from LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries-ref.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries-ref.html
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries.html
similarity index 100%
rename from LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/lang-pseudo-class-across-shadow-boundaries.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-across-shadow-boundaries.html
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected-expected.txt
new file mode 100644
index 000000000000..65f4167ed797
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected-expected.txt
@@ -0,0 +1,3 @@
+
+PASS :lang pseudo class should work in a disconnected subtree
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected.html
new file mode 100644
index 000000000000..30bb773a3184
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-disconnected.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<link rel="help" href="https://drafts.csswg.org/selectors/#lang-pseudo"/>
+<body>
+<div id="container" lang="zh"><span></span></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(() => {
+    let target = container.querySelector('span');
+    assert_true(target.matches(":lang(zh)"));
+    target.parentNode.remove();
+    assert_true(target.matches(":lang(zh)"));
+
+    const anotherContainer = document.createElement('div');
+    anotherContainer.innerHTML = '<div lang="fr"><span></span></div>';
+    target = anotherContainer.querySelector('span');
+    assert_true(target.matches(":lang(fr)"));
+    document.body.append(target.parentNode);
+    assert_true(target.matches(":lang(fr)"));
+}, ":lang pseudo class should work in a disconnected subtree");
+</script>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute-expected.txt
new file mode 100644
index 000000000000..365fd2ee2e1a
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute-expected.txt
@@ -0,0 +1,5 @@
+Tests if empty language declarations are supported
+
+
+PASS Test if empty language attributes are supported
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml
new file mode 100644
index 000000000000..5765e0bae18c
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/i18n/lang-pseudo-class-empty-attribute.xhtml
@@ -0,0 +1,26 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#lang-pseudo"/>
+    <style type="text/css">
+      span {background: white;display:none}
+      span:lang(de) {background: red}
+    </style>
+  </head>
+  <body>
+    <p>Tests if empty language declarations are supported</p>
+    <p xml:lang="de">
+      <span lang="" id="emptyLang"/>
+      <span xml:lang="" id="emptyXmlLang"/>
+      <span id="noLang"/>
+    </p>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+      test(() => {
+        assert_equals(getComputedStyle(document.getElementById("emptyLang")).backgroundColor, "rgb(255, 255, 255)");
+        assert_equals(getComputedStyle(document.getElementById("emptyXmlLang")).backgroundColor, "rgb(255, 255, 255)");
+        assert_equals(getComputedStyle(document.getElementById("noLang")).backgroundColor, "rgb(255, 0, 0)");
+      }, "Test if empty language attributes are supported");
+    </script>
+  </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has-expected.xht
new file mode 100644
index 000000000000..05a13794482a
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has-expected.xht
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div></div>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/dir-pseudo-container-query-invalidation.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has.html
similarity index 72%
rename from LayoutTests/fast/css/dir-pseudo-container-query-invalidation.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has.html
index c3a6304966b1..0f5d0726567b 100644
--- a/LayoutTests/fast/css/dir-pseudo-container-query-invalidation.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/dir-pseudo-class-in-has.html
@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+<head>
+    <link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#relational"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#dir-pseudo"/>
+    <link rel="match" href="../../reference/ref-filled-green-100px-square.xht"/>
+</head>
 <body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
     <section><div id="ltr1" class="ltr"></div></section>
     <section id="ltr2" dir="rtl"><div class="ltr"><span></span></div></section>
     <section dir="ltr"><div class="ltr"><span></span></div></section>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element-expected.xht
new file mode 100644
index 000000000000..05a13794482a
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element-expected.xht
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div></div>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html
similarity index 53%
rename from LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html
index 99533057df14..93ece465dd51 100644
--- a/LayoutTests/fast/css/lang-pseudo-container-query-document-element-invalidation.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html
@@ -1,9 +1,14 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
-<meta http-equiv="content-language" content="fr">
+    <link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+    <link rel="help" href="https://drafts.csswg.org/selectors/#lang-pseudo">
+    <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+    <meta http-equiv="content-language" content="fr">
 </head>
 <body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
     <div><span></span></div>
     <style>
         div { width: 100px; height: 100px; }
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-expected.xht
new file mode 100644
index 000000000000..05a13794482a
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-expected.xht
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div></div>
+ </body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements-expected.xht
new file mode 100644
index 000000000000..05a13794482a
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements-expected.xht
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div></div>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html
similarity index 53%
rename from LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html
index d41be055e44c..5dbe9c711a9c 100644
--- a/LayoutTests/fast/css/lang-pseudo-container-query-multiple-document-elements-invalidation.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-multiple-document-elements.html
@@ -1,7 +1,13 @@
+<!DOCTYPE html>
 <html lang="fr" class="reftest-wait">
+<link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+<link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+<link rel="help" href="https://drafts.csswg.org/selectors/#lang-pseudo">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<body>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 <div><span></span></div>
 <script>
-
 const test = document.querySelector('div').matches('*:has(:lang(fr))') ? 'PASS' : 'FAIL';
 
 const newDocumentElement = document.createElement('html');
@@ -18,8 +24,9 @@
 </style>
 </head>
 <body>
-<div><span class="${test}">${test}</span></div>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div><span class="${test.toLowerCase()}">${test}</span></div>
 </body>`;
-
 </script>
+</body>
 </html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml-expected.xht b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml-expected.xht
new file mode 100644
index 000000000000..05a13794482a
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml-expected.xht
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <style type="text/css"><![CDATA[
+  div
+  {
+  background-color: green;
+  height: 100px;
+  width: 100px;
+  }
+  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div></div>
+ </body>
+</html>
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml.xhtml b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml
similarity index 80%
rename from LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml.xhtml
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml
index 07a1f1f0008d..3a421c2e1209 100644
--- a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation-xhtml.xhtml
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml
@@ -2,14 +2,21 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html class="reftest-wait" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#relational"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#lang-pseudo"/>
+    <link rel="match" href="../../reference/ref-filled-green-100px-square.xht"/>
+</head>
 <body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
     <section class="lang"><div xml:lang="zh" lang="ja"></div></section>
     <section class="lang"><div id="ja" xml:lang="ja" lang="ja"></div></section>
     <div><section class="lang" id="fr" lang="fr" style="-webkit-locale: 'en'"><div></div></section></div>
     <div><section class="lang" id="es" xml:lang="es"><div></div></section></div>
     <section class="lang"><div id="kr" xml:lang="kr" lang="en"></div></section>
     <style>
-        body > * { background: red; }
+        body > *:not(p) { background: red; }
         section, div { width: 100px; height: 20px; }
         .lang:has(:lang(zh)) { background: green; }
         .lang:has(:lang(ja)) { background: red; }
diff --git a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation.html b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has.html
similarity index 74%
rename from LayoutTests/fast/css/lang-pseudo-container-query-invalidation.html
rename to LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has.html
index adac25640fe3..83404fcbc74d 100644
--- a/LayoutTests/fast/css/lang-pseudo-container-query-invalidation.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/lang-pseudo-class-in-has.html
@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
+<head>
+    <link rel="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org"/>
+    <link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+    <link rel="help" href="https://drafts.csswg.org/selectors/#lang-pseudo">
+    <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+</head>
 <body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
     <section class="lang"><div lang="en"></div></section>
     <section class="lang" id="fr" lang="fr"><div></div></section>
     <section class="lang" id="ja" lang="ja" style="-webkit-locale: 'en'"><div></div></section>