Merging upstream version 127.0.

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

18 files changed, 40 insertions, 102 deletions

diff --git a/testing/web-platform/meta/close-watcher/__dir__.ini b/testing/web-platform/meta/close-watcher/__dir__.ini
index 8a73333e77..83fabadf90 100644
--- a/testing/web-platform/meta/close-watcher/__dir__.ini
+++ b/testing/web-platform/meta/close-watcher/__dir__.ini
@@ -1 +1,3 @@
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1859702
+implementation-status: backlog
 prefs: [dom.element.popover.enabled: true]
diff --git a/testing/web-platform/meta/close-watcher/basic.html.ini b/testing/web-platform/meta/close-watcher/basic.html.ini
index b85448e71e..94cc9b0d78 100644
--- a/testing/web-platform/meta/close-watcher/basic.html.ini
+++ b/testing/web-platform/meta/close-watcher/basic.html.ini
@@ -1,75 +1,21 @@
 [basic.html]
-  [close() then destroy() fires only one close event]
+  [close() then destroy()]
     expected: FAIL
 
-  [requestClose() with no user activation only fires close]
+  [destroy() then close request]
     expected: FAIL
 
-  [destroy() then requestClose() fires no events]
+  [Close request then destroy()]
     expected: FAIL
 
-  [close() then requestClose() fires only one close event]
+  [close() then requestClose()]
     expected: FAIL
 
-  [requestClose() then destroy() fires only one close event]
+  [destroy() then requestClose()]
     expected: FAIL
 
-  [requestClose() with no user activation only fires close]
+  [requestClose() then destroy()]
     expected: FAIL
 
-  [destroy() then requestClose() fires no events]
-    expected: FAIL
-
-  [close() then requestClose() fires only one close event]
-    expected: FAIL
-
-  [requestClose() then destroy() fires only one close event]
-    expected: FAIL
-
-  [requestClose() with no user activation only fires close]
-    expected: FAIL
-
-  [destroy() then requestClose() fires no events]
-    expected: FAIL
-
-  [close() then requestClose() fires only one close event]
-    expected: FAIL
-
-  [requestClose() then destroy() fires only one close event]
-    expected: FAIL
-
-  [destroy() then close request fires no events]
-    expected: FAIL
-
-  [Close request then destroy() fires only one close event]
-    expected: FAIL
-
-  [requestClose() with no user activation only fires close]
-    expected: FAIL
-
-  [destroy() then requestClose() fires no events]
-    expected: FAIL
-
-  [close() then requestClose() fires only one close event]
-    expected: FAIL
-
-  [requestClose() then destroy() fires only one close event]
-    expected: FAIL
-
-  [destroy() then close request fires no events]
-    expected: FAIL
-
-  [Close request then destroy() fires only one close event]
-    expected: FAIL
-
-  [destroy() then close request fires no events]
-    expected: FAIL
-
-  [Close request then destroy() fires only one close event]
-    expected: FAIL
-
-  [destroy() then close request fires no events]
-    expected: FAIL
-
-  [Close request then destroy() fires only one close event]
+  [requestClose() with no user activation]
     expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/esc-key/not-user-activation.html.ini b/testing/web-platform/meta/close-watcher/esc-key/not-user-activation.html.ini
index 33dbd15697..a462b70c87 100644
--- a/testing/web-platform/meta/close-watcher/esc-key/not-user-activation.html.ini
+++ b/testing/web-platform/meta/close-watcher/esc-key/not-user-activation.html.ini
@@ -1,3 +1,3 @@
 [not-user-activation.html]
-  [Esc key does not count as user activation, so if it is the sole user interaction, that fires close but not cancel]
+  [Esc key does not count as user activation, so if it is the sole user interaction, cancel is cancelable=false]
     expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nn-CloseWatcher.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nn-CloseWatcher.html.ini
new file mode 100644
index 0000000000..641e1bdfac
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nn-CloseWatcher.html.ini
@@ -0,0 +1,3 @@
+[nn-CloseWatcher.html]
+  [Create two close watchers without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nn-dialog.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nn-dialog.html.ini
new file mode 100644
index 0000000000..d28174586e
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nn-dialog.html.ini
@@ -0,0 +1,3 @@
+[nn-dialog.html]
+  [Create two close watchers without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nn.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nn.html.ini
deleted file mode 100644
index 88e3644b1f..0000000000
--- a/testing/web-platform/meta/close-watcher/user-activation/nn.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[nn.html?CloseWatcher]
-  [Create two close watchers without user activation]
-    expected: FAIL
-
-
-[nn.html?dialog]
-  [Create two close watchers without user activation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nnn-CloseWatcher.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nnn-CloseWatcher.html.ini
new file mode 100644
index 0000000000..e107454db7
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nnn-CloseWatcher.html.ini
@@ -0,0 +1,3 @@
+[nnn-CloseWatcher.html]
+  [Create three close watchers without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nnn-dialog.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nnn-dialog.html.ini
new file mode 100644
index 0000000000..11b9e67899
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nnn-dialog.html.ini
@@ -0,0 +1,3 @@
+[nnn-dialog.html]
+  [Create three close watchers without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nnn.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nnn.html.ini
deleted file mode 100644
index c55baa42f8..0000000000
--- a/testing/web-platform/meta/close-watcher/user-activation/nnn.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[nnn.html?dialog]
-  [Create three close watchers without user activation]
-    expected: FAIL
-
-
-[nnn.html?CloseWatcher]
-  [Create three close watchers without user activation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nyyn-CloseWatcher.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nyyn-CloseWatcher.html.ini
new file mode 100644
index 0000000000..48cd665730
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nyyn-CloseWatcher.html.ini
@@ -0,0 +1,3 @@
+[nyyn-CloseWatcher.html]
+  [Create a close watcher without user activation; create two close watchers with user activation; create a close watcher without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nyyn-dialog.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nyyn-dialog.html.ini
new file mode 100644
index 0000000000..a59d416371
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nyyn-dialog.html.ini
@@ -0,0 +1,3 @@
+[nyyn-dialog.html]
+  [Create a close watcher without user activation; create two close watchers with user activation; create a close watcher without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nyyn.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nyyn.html.ini
deleted file mode 100644
index 943b9f3521..0000000000
--- a/testing/web-platform/meta/close-watcher/user-activation/nyyn.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[nyyn.html?CloseWatcher]
-  [Create a close watcher without user activation; create two close watchers with user activation; create a close watcher without user activation]
-    expected: FAIL
-
-
-[nyyn.html?dialog]
-  [Create a close watcher without user activation; create two close watchers with user activation; create a close watcher without user activation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nyyyn-CloseWatcher.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nyyyn-CloseWatcher.html.ini
new file mode 100644
index 0000000000..75985eeeb2
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nyyyn-CloseWatcher.html.ini
@@ -0,0 +1,3 @@
+[nyyyn-CloseWatcher.html]
+  [Create a close watcher without user activation; create three close watchers with user activation; create a close watcher without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nyyyn-dialog.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nyyyn-dialog.html.ini
new file mode 100644
index 0000000000..d63a1f9617
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/nyyyn-dialog.html.ini
@@ -0,0 +1,3 @@
+[nyyyn-dialog.html]
+  [Create a close watcher without user activation; create three close watchers with user activation; create a close watcher without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/nyyyn.html.ini b/testing/web-platform/meta/close-watcher/user-activation/nyyyn.html.ini
deleted file mode 100644
index f21a473a65..0000000000
--- a/testing/web-platform/meta/close-watcher/user-activation/nyyyn.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[nyyyn.html?dialog]
-  [Create a close watcher without user activation; create three close watchers with user activation; create a close watcher without user activation]
-    expected: FAIL
-
-
-[nyyyn.html?CloseWatcher]
-  [Create a close watcher without user activation; create three close watchers with user activation; create a close watcher without user activation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/ynn-CloseWatcher.html.ini b/testing/web-platform/meta/close-watcher/user-activation/ynn-CloseWatcher.html.ini
new file mode 100644
index 0000000000..df2246e1d4
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/ynn-CloseWatcher.html.ini
@@ -0,0 +1,3 @@
+[ynn-CloseWatcher.html]
+  [Create a close watcher with user activation; create two close watchers without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/ynn-dialog.html.ini b/testing/web-platform/meta/close-watcher/user-activation/ynn-dialog.html.ini
new file mode 100644
index 0000000000..8e3273e296
--- /dev/null
+++ b/testing/web-platform/meta/close-watcher/user-activation/ynn-dialog.html.ini
@@ -0,0 +1,3 @@
+[ynn-dialog.html]
+  [Create a close watcher with user activation; create two close watchers without user activation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/close-watcher/user-activation/ynn.html.ini b/testing/web-platform/meta/close-watcher/user-activation/ynn.html.ini
deleted file mode 100644
index 6294eed185..0000000000
--- a/testing/web-platform/meta/close-watcher/user-activation/ynn.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[ynn.html?dialog]
-  [Create a close watcher with user activation; create two close watchers without user activation]
-    expected: FAIL
-
-
-[ynn.html?CloseWatcher]
-  [Create a close watcher with user activation; create two close watchers without user activation]
-    expected: FAIL