Merging upstream version 126.0.

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

12 files changed, 56 insertions, 52 deletions

diff --git a/testing/web-platform/meta/service-workers/service-worker/fetch-audio-tainting.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/fetch-audio-tainting.https.html.ini
index 35890f0270..ce40e063aa 100644
--- a/testing/web-platform/meta/service-workers/service-worker/fetch-audio-tainting.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/fetch-audio-tainting.https.html.ini
@@ -1,3 +1,3 @@
 [fetch-audio-tainting.https.html]
   expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
+    if (os == "android") and not debug: [OK, ERROR]
diff --git a/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
index 3d99637946..d12498d1e0 100644
--- a/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https.html.ini
@@ -1,4 +1,6 @@
 [fetch-canvas-tainting-video-with-range-request.https.html]
+  expected:
+    if (os == "android") and not debug: [OK, ERROR]
   [range responses from multiple origins (cross-origin first)]
     expected:
       if os == "android": FAIL
@@ -6,8 +8,8 @@
   [range responses from single origin with both opaque and non-opaque responses]
     expected:
       if (os == "win") and (processor == "x86_64") and not debug: [FAIL, PASS, TIMEOUT]
-      if (os == "mac") and not debug: [FAIL, PASS]
       if (os == "win") and (processor == "x86"): [FAIL, PASS]
+      if (os == "mac") and not debug: [FAIL, PASS]
       FAIL
 
   [synth and cross-origin fallback range responses]
diff --git a/testing/web-platform/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini
index c68a8cd2de..e6079cd8b5 100644
--- a/testing/web-platform/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/fetch-event-respond-with-readable-stream.https.html.ini
@@ -2,10 +2,9 @@
   expected: TIMEOUT
   [Cancellation in the page should be observable in the service worker with nonempty stream]
     expected:
-      if os == "win": [FAIL, TIMEOUT, PASS, NOTRUN]
+      if os == "win": [FAIL, NOTRUN, PASS, TIMEOUT]
       if os == "mac": [FAIL, PASS, TIMEOUT, NOTRUN]
-      if os == "android": [PASS, FAIL]
-      [FAIL, PASS]
+      [PASS, FAIL]
 
   [Cancellation in the page should be observable in the service worker with empty stream]
     expected:
@@ -18,7 +17,7 @@
   [Abort in the page should be observable in the service worker with nonempty stream]
     expected:
       if os == "win": [PASS, NOTRUN, TIMEOUT]
-      if os == "linux": [PASS, FAIL]
+      if os == "linux": [FAIL, PASS]
 
   [Subresource built from a ReadableStream - fetch stream]
     expected:
@@ -26,7 +25,7 @@
 
   [Main resource built from a ReadableStream]
     expected:
-      if os == "win": [PASS, TIMEOUT]
+      if os == "win": [PASS, TIMEOUT, NOTRUN]
 
   [Main resource built from a ReadableStream - delayed]
     expected:
@@ -34,7 +33,7 @@
 
   [Main resource built from a ReadableStream - fetch stream]
     expected:
-      if os == "win": [PASS, NOTRUN]
+      if os == "win": [PASS, TIMEOUT, NOTRUN]
       if os == "mac": [PASS, TIMEOUT]
 
   [Subresource built from a ReadableStream - delayed]
diff --git a/testing/web-platform/meta/service-workers/service-worker/fetch-request-redirect.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/fetch-request-redirect.https.html.ini
index 50aa4e20d2..a140140f03 100644
--- a/testing/web-platform/meta/service-workers/service-worker/fetch-request-redirect.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/fetch-request-redirect.https.html.ini
@@ -1,8 +1,7 @@
 [fetch-request-redirect.https.html]
   max-asserts: 2
   expected:
-    if (os == "linux") and not debug and not fission: [OK, ERROR, CRASH]
-    if (os == "linux") and not debug and fission: [OK, ERROR]
-    if (os == "win") and debug and (processor == "x86"): [OK, ERROR, CRASH]
     if (os == "win") and debug and (processor == "x86_64"): [OK, ERROR]
-    if (os == "android") and fission: [OK, TIMEOUT]
+    if (os == "win") and debug and (processor == "x86"): [OK, ERROR, CRASH]
+    if (os == "linux") and not debug: [OK, ERROR]
+    if (os == "android") and not debug: [OK, ERROR]
diff --git a/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
index 203d95c4b9..d32272c3b8 100644
--- a/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
@@ -61,17 +61,17 @@
 [navigation-redirect.https.html?default]
   [SW-fallbacked redirect to same-origin same-scope.]
     expected:
-      if not debug and (os == "linux") and asan and fission: [PASS, FAIL]
-      if not debug and (os == "win"): [PASS, FAIL]
+      if (os == "linux") and asan and fission: [PASS, FAIL]
+      if (os == "win") and not debug: [PASS, FAIL]
 
   [SW-fallbacked redirect to same-origin same-scope with a hash fragment.]
     expected:
-      if (os == "win") and debug and not swgl: [PASS, FAIL]
+      if (os == "win") and debug: [PASS, FAIL]
 
   [SW-fallbacked redirect to same-origin same-scope with different hash fragments.]
     expected:
-      if (os == "win") and (processor == "x86_64") and debug and not swgl: [PASS, FAIL]
+      if (os == "win") and debug and (processor == "x86_64"): [PASS, FAIL]
 
   [SW-fallbacked redirect to other-origin and back to same-origin.]
     expected:
-      if swgl and (os == "win"): [PASS, FAIL]
+      if (processor == "x86") and not debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/service-workers/service-worker/navigation-timing-extended.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/navigation-timing-extended.https.html.ini
index 5a23cc0b12..99a1e50eb6 100644
--- a/testing/web-platform/meta/service-workers/service-worker/navigation-timing-extended.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/navigation-timing-extended.https.html.ini
@@ -1,8 +1,7 @@
 [navigation-timing-extended.https.html]
   [Service worker controlled navigation timing]
     expected:
-      if (os == "win") and not debug and (processor == "x86"): [FAIL, PASS]
-      if (os == "linux") and not fission and not debug: [FAIL, PASS]
-      if (os == "win") and debug: [FAIL, PASS]
-      if os == "mac": [FAIL, PASS]
-      FAIL
+      if (os == "linux") and not fission and debug: FAIL
+      if (os == "linux") and fission: FAIL
+      if os == "android": FAIL
+      [FAIL, PASS]
diff --git a/testing/web-platform/meta/service-workers/service-worker/no-dynamic-import.any.js.ini b/testing/web-platform/meta/service-workers/service-worker/no-dynamic-import.any.js.ini
deleted file mode 100644
index ad684f808b..0000000000
--- a/testing/web-platform/meta/service-workers/service-worker/no-dynamic-import.any.js.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[no-dynamic-import.any.serviceworker.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
-  [Module URL]
-    expected: FAIL
-
-  [Another module URL]
-    expected: FAIL
-
-  [Module data: URL]
-    expected: FAIL
diff --git a/testing/web-platform/meta/service-workers/service-worker/partitioned.tentative.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/partitioned.tentative.https.html.ini
index 6d267cda2a..39e8ad1df2 100644
--- a/testing/web-platform/meta/service-workers/service-worker/partitioned.tentative.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/partitioned.tentative.https.html.ini
@@ -6,4 +6,5 @@
       if os == "android": FAIL
 
   [Services workers with cross-site ancestors are partitioned.]
-    expected: FAIL
+    expected:
+      if os == "android": FAIL
diff --git a/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html.ini
index a9541b5da7..3a61291169 100644
--- a/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html.ini
@@ -16,3 +16,6 @@
 
   [Main resource fallback to the network when there is no cache entry]
     expected: FAIL
+
+  [Main resource load matched with the cache source, with specifying the cache name]
+    expected: FAIL
diff --git a/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-mutiple-conditions.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-mutiple-conditions.https.html.ini
new file mode 100644
index 0000000000..9761757cc0
--- /dev/null
+++ b/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-mutiple-conditions.https.html.ini
@@ -0,0 +1,6 @@
+[static-router-mutiple-conditions.https.html]
+  [Multiple conditions work with `and` operation]
+    expected: FAIL
+
+  [Multiple conditions including requestDestination work with `and` operation]
+    expected: FAIL
diff --git a/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html.ini
index c5eb8ad145..e725a2bd78 100644
--- a/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html.ini
@@ -20,12 +20,6 @@
   [Subresource cross origin load matched with URLPattern condition via constructed object]
     expected: FAIL
 
-  [Subresource load matched with URLPattern condition via URLPatternInit]
-    expected: FAIL
-
-  [Subresource cross origin load not matched with URLPattern condition via URLPatternInit]
-    expected: FAIL
-
   [Subresource load matched with URLPattern condition via string]
     expected: FAIL
 
@@ -40,3 +34,15 @@
 
   [Subresource load matched with the cache source rule]
     expected: FAIL
+
+  [Subresource load matched with URLPattern condition via URLPatternCompatible]
+    expected: FAIL
+
+  [Subresource cross origin load not matched with URLPattern condition via URLPatternCompatible]
+    expected: FAIL
+
+  [Subresource load did not match with the cache and fallback to the network]
+    expected: FAIL
+
+  [Subresource load matched with the cache source, with specifying the cache name]
+    expected: FAIL
diff --git a/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini
index d522857c70..055676aec4 100644
--- a/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini
@@ -2,27 +2,27 @@
   disabled:
     if os == "android": bug 1550895 (frequently fails on geckoview)
   expected:
-    if (os == "win") and not debug: [ERROR, OK]
-    if (os == "win") and debug: ERROR
-    if os == "mac": ERROR
-    [ERROR, TIMEOUT]
+    if (os == "win") and not debug and (processor == "x86_64"): [ERROR, OK]
+    if (os == "win") and not debug and (processor == "x86"): [ERROR, TIMEOUT, OK]
+    if os == "linux": [ERROR, TIMEOUT]
+    ERROR
   [ServiceWorkerRegistration.update() from installing service worker throws.]
     expected:
-      if (os == "linux") and fission and debug: [PASS, TIMEOUT]
-      if (os == "linux") and fission and not debug: [PASS, TIMEOUT, NOTRUN]
-      if (os == "linux") and not fission: [PASS, TIMEOUT, NOTRUN]
+      if (os == "linux") and debug and fission: [PASS, TIMEOUT]
+      if (os == "linux") and debug and not fission: [PASS, TIMEOUT, NOTRUN]
       if (os == "win") and not debug: [PASS, FAIL]
+      if (os == "linux") and not debug: [PASS, TIMEOUT, NOTRUN]
 
   [ServiceWorkerRegistration.update() from active service worker succeeds while installing service worker.]
     expected:
       if (os == "win") and not debug: [PASS, FAIL, TIMEOUT]
-      if (os == "linux") and not fission: [PASS, NOTRUN]
-      if (os == "linux") and fission: [PASS, FAIL, TIMEOUT, NOTRUN]
       if (os == "mac") and not debug: [PASS, FAIL, TIMEOUT]
+      if (os == "linux") and fission: [PASS, FAIL, TIMEOUT, NOTRUN]
+      if (os == "linux") and not fission: [PASS, NOTRUN]
 
   [ServiceWorkerRegistration.update() from client succeeds while installing service worker.]
     expected:
-      if not asan and not debug and (os == "win") and (processor == "x86_64"): [FAIL, PASS]
-      if not asan and not debug and (os == "win") and (processor == "x86"): [PASS, FAIL]
-      if not asan and not debug and (os == "mac"): [PASS, FAIL]
+      if not asan and (os == "win") and not debug and (processor == "x86_64"): [PASS, FAIL]
+      if not asan and (os == "win") and not debug and (processor == "x86"): [PASS, FAIL]
+      if not asan and (os == "mac") and not debug: [PASS, FAIL]
       if asan: [PASS, FAIL, TIMEOUT]