Merging upstream version 126.0.

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

13 files changed, 48 insertions, 83 deletions

diff --git a/testing/web-platform/meta/fenced-frame/csp-allowed-transparent.https.html.ini b/testing/web-platform/meta/fenced-frame/csp-allowed-transparent.https.html.ini
new file mode 100644
index 0000000000..c969c298f2
--- /dev/null
+++ b/testing/web-platform/meta/fenced-frame/csp-allowed-transparent.https.html.ini
@@ -0,0 +1,12 @@
+[csp-allowed-transparent.https.html]
+  [Fenced frame loaded for CSP fenced-frame-src *]
+    expected: FAIL
+
+  [Fenced frame loaded for CSP fenced-frame-src https://*:*]
+    expected: FAIL
+
+  [Fenced frame loaded for CSP fenced-frame-src https://web-platform.test:8443]
+    expected: FAIL
+
+  [Fenced frame loaded for CSP fenced-frame-src https://web-platform.test:*]
+    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/csp-allowed.https.html.ini b/testing/web-platform/meta/fenced-frame/csp-allowed.https.html.ini
index b26b78ee69..679052c3c6 100644
--- a/testing/web-platform/meta/fenced-frame/csp-allowed.https.html.ini
+++ b/testing/web-platform/meta/fenced-frame/csp-allowed.https.html.ini
@@ -2,35 +2,26 @@
   [Fenced frame loaded for CSP fenced-frame-src * using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns true for * using config]
-    expected: FAIL
-
   [Fenced frame loaded for CSP fenced-frame-src https: using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns true for https: using config]
-    expected: FAIL
-
   [Fenced frame loaded for CSP fenced-frame-src https://*:* using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns true for https://*:* using config]
-    expected: FAIL
-
   [Fenced frame loaded for CSP fenced-frame-src * using urn:uuid]
     expected: FAIL
 
-  [Opaque-ads can load API returns true for * using urn:uuid]
+  [Fenced frame loaded for CSP fenced-frame-src https: using urn:uuid]
     expected: FAIL
 
-  [Fenced frame loaded for CSP fenced-frame-src https: using urn:uuid]
+  [Fenced frame loaded for CSP fenced-frame-src https://*:* using urn:uuid]
     expected: FAIL
 
-  [Opaque-ads can load API returns true for https: using urn:uuid]
+  [Opaque-ads can load API returns true for *]
     expected: FAIL
 
-  [Fenced frame loaded for CSP fenced-frame-src https://*:* using urn:uuid]
+  [Opaque-ads can load API returns true for https:]
     expected: FAIL
 
-  [Opaque-ads can load API returns true for https://*:* using urn:uuid]
+  [Opaque-ads can load API returns true for https://*:*]
     expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/csp-blocked-transparent.https.html.ini b/testing/web-platform/meta/fenced-frame/csp-blocked-transparent.https.html.ini
new file mode 100644
index 0000000000..02d48a40d1
--- /dev/null
+++ b/testing/web-platform/meta/fenced-frame/csp-blocked-transparent.https.html.ini
@@ -0,0 +1,12 @@
+[csp-blocked-transparent.https.html]
+  [Fenced frame loaded for CSP fenced-frame-src none]
+    expected: FAIL
+
+  [Fenced frame loaded for CSP fenced-frame-src https://localhost:80]
+    expected: FAIL
+
+  [Fenced frame loaded for CSP fenced-frame-src https://*:80]
+    expected: FAIL
+
+  [Fenced frame loaded for CSP fenced-frame-src https://localhost:*]
+    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/csp-blocked.https.html.ini b/testing/web-platform/meta/fenced-frame/csp-blocked.https.html.ini
index 554c25af0b..d0e5135751 100644
--- a/testing/web-platform/meta/fenced-frame/csp-blocked.https.html.ini
+++ b/testing/web-platform/meta/fenced-frame/csp-blocked.https.html.ini
@@ -2,77 +2,59 @@
   [Fenced frame blocked for CSP fenced-frame-src 'none' using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for 'none' using config]
-    expected: FAIL
-
   [Fenced frame blocked for CSP fenced-frame-src 'self' using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for 'self' using config]
-    expected: FAIL
-
   [Fenced frame blocked for CSP fenced-frame-src data: using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for data: using config]
-    expected: FAIL
-
   [Fenced frame blocked for CSP fenced-frame-src https://* using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for https://* using config]
-    expected: FAIL
-
   [Fenced frame blocked for CSP fenced-frame-src https://*:80 using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for https://*:80 using config]
-    expected: FAIL
-
   [Fenced frame blocked for CSP fenced-frame-src https://b.test:* using config]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for https://b.test:* using config]
-    expected: FAIL
-
   [Fenced frame not loaded using config if any of CSPs in place disallow loading]
     expected: FAIL
 
   [Fenced frame blocked for CSP fenced-frame-src 'none' using urn:uuid]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for 'none' using urn:uuid]
+  [Fenced frame blocked for CSP fenced-frame-src 'self' using urn:uuid]
     expected: FAIL
 
-  [Fenced frame blocked for CSP fenced-frame-src 'self' using urn:uuid]
+  [Fenced frame blocked for CSP fenced-frame-src data: using urn:uuid]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for 'self' using urn:uuid]
+  [Fenced frame blocked for CSP fenced-frame-src https://* using urn:uuid]
     expected: FAIL
 
-  [Fenced frame blocked for CSP fenced-frame-src data: using urn:uuid]
+  [Fenced frame blocked for CSP fenced-frame-src https://*:80 using urn:uuid]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for data: using urn:uuid]
+  [Fenced frame blocked for CSP fenced-frame-src https://b.test:* using urn:uuid]
     expected: FAIL
 
-  [Fenced frame blocked for CSP fenced-frame-src https://* using urn:uuid]
+  [Fenced frame not loaded using urn:uuid if any of CSPs in place disallow loading]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for https://* using urn:uuid]
+  [Opaque-ads can load API returns false for 'none']
     expected: FAIL
 
-  [Fenced frame blocked for CSP fenced-frame-src https://*:80 using urn:uuid]
+  [Opaque-ads can load API returns false for 'self']
     expected: FAIL
 
-  [Opaque-ads can load API returns false for https://*:80 using urn:uuid]
+  [Opaque-ads can load API returns false for data:]
     expected: FAIL
 
-  [Fenced frame blocked for CSP fenced-frame-src https://b.test:* using urn:uuid]
+  [Opaque-ads can load API returns false for https://*]
     expected: FAIL
 
-  [Opaque-ads can load API returns false for https://b.test:* using urn:uuid]
+  [Opaque-ads can load API returns false for https://*:80]
     expected: FAIL
 
-  [Fenced frame not loaded using urn:uuid if any of CSPs in place disallow loading]
+  [Opaque-ads can load API returns false for https://b.test:*]
     expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/csp-transparent-url.https.html.ini b/testing/web-platform/meta/fenced-frame/csp-transparent-url.https.html.ini
deleted file mode 100644
index 994eb653fd..0000000000
--- a/testing/web-platform/meta/fenced-frame/csp-transparent-url.https.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[csp-transparent-url.https.html]
-  [Fenced frame loaded for CSP fenced-frame-src *]
-    expected: FAIL
-
-  [Fenced frame loaded for CSP fenced-frame-src https:]
-    expected: FAIL
-
-  [Fenced frame loaded for CSP fenced-frame-src 'self']
-    expected: FAIL
-
-  [Fenced frame blocked for CSP fenced-frame-src 'none']
-    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/cspee.https.html.ini b/testing/web-platform/meta/fenced-frame/cspee.https.html.ini
index db072c20aa..0e761b4482 100644
--- a/testing/web-platform/meta/fenced-frame/cspee.https.html.ini
+++ b/testing/web-platform/meta/fenced-frame/cspee.https.html.ini
@@ -1,6 +1,7 @@
 [cspee.https.html]
   [fenced frame should not be loaded in CSPEE]
     expected:
+      if (processor == "x86_64") and (os == "win") and not debug: [FAIL, PASS]
       if (processor == "x86") and not debug: [FAIL, PASS]
       FAIL
 
diff --git a/testing/web-platform/meta/fenced-frame/disable-untrusted-network.https.html.ini b/testing/web-platform/meta/fenced-frame/disable-untrusted-network.https.html.ini
deleted file mode 100644
index c97f41f070..0000000000
--- a/testing/web-platform/meta/fenced-frame/disable-untrusted-network.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[disable-untrusted-network.https.html]
-  [window.fence.disableUntrustedNetwork availability]
-    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/report-event.https.html.ini b/testing/web-platform/meta/fenced-frame/report-event.https.html.ini
new file mode 100644
index 0000000000..e2a8f233d1
--- /dev/null
+++ b/testing/web-platform/meta/fenced-frame/report-event.https.html.ini
@@ -0,0 +1,3 @@
+[report-event.https.html]
+  [Test that window.fence.reportEvent() succeeds in a fenced frame.]
+    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/revoke-nested-fenced-frame-in-iframe-navigation.https.html.ini b/testing/web-platform/meta/fenced-frame/revoke-nested-fenced-frame-in-iframe-navigation.https.html.ini
deleted file mode 100644
index f3958c85d5..0000000000
--- a/testing/web-platform/meta/fenced-frame/revoke-nested-fenced-frame-in-iframe-navigation.https.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[revoke-nested-fenced-frame-in-iframe-navigation.https.html]
-  [FF->IF->FF navigation works]
-    expected: FAIL
-
-  [FF->UIF->FF navigation works]
-    expected: FAIL
-
-  [window.fence.disableUntrustedNetwork disables FF->IF->FF navigation]
-    expected: FAIL
-
-  [window.fence.disableUntrustedNetwork disables FF->UF->FF navigation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/revoke-nested-fenced-frame-navigation.https.html.ini b/testing/web-platform/meta/fenced-frame/revoke-nested-fenced-frame-navigation.https.html.ini
deleted file mode 100644
index 03ae30ecc1..0000000000
--- a/testing/web-platform/meta/fenced-frame/revoke-nested-fenced-frame-navigation.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[revoke-nested-fenced-frame-navigation.https.html]
-  [FF->FF navigation works]
-    expected: FAIL
-
-  [window.fence.disableUntrustedNetwork disables FF->FF navigation]
-    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/revoke-popup.https.html.ini b/testing/web-platform/meta/fenced-frame/revoke-popup.https.html.ini
deleted file mode 100644
index 27ca7eb599..0000000000
--- a/testing/web-platform/meta/fenced-frame/revoke-popup.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[revoke-popup.https.html]
-  [window.fence.disableUntrustedNetwork disables popup navigations]
-    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/revoke-unfenced-top-navigation.https.html.ini b/testing/web-platform/meta/fenced-frame/revoke-unfenced-top-navigation.https.html.ini
deleted file mode 100644
index b9119dcb46..0000000000
--- a/testing/web-platform/meta/fenced-frame/revoke-unfenced-top-navigation.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[revoke-unfenced-top-navigation.https.html]
-  [window.fence.disableUntrustedNetwork disables _unfencedTop navigations]
-    expected: FAIL
diff --git a/testing/web-platform/meta/fenced-frame/shared-workers.https.html.ini b/testing/web-platform/meta/fenced-frame/shared-workers.https.html.ini
new file mode 100644
index 0000000000..d3d64a2968
--- /dev/null
+++ b/testing/web-platform/meta/fenced-frame/shared-workers.https.html.ini
@@ -0,0 +1,3 @@
+[shared-workers.https.html]
+  [Shared workers should not be shared across fenced frame boundaries]
+    expected: FAIL