Merging upstream version 125.0.1.

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

12 files changed, 93 insertions, 36 deletions

diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
index 6b04469661..712b2b1efe 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
@@ -1,7 +1,10 @@
 [resource-selection-candidate-insert-before.html]
   [inserting another source before the candidate]
     expected:
-      if (os == "linux") and debug and not fission: [FAIL, PASS]
-      if (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not tsan and not swgl and debug and fission: [FAIL, PASS]
+      if (os == "linux") and not tsan and not swgl and debug and not fission: [FAIL, PASS]
+      if (os == "linux") and not tsan and swgl and not fission: [FAIL, PASS]
+      if (os == "linux") and not tsan and not swgl and not debug: [FAIL, PASS]
       if (os == "win") and swgl: [FAIL, PASS]
+      if (os == "linux") and tsan: [PASS, FAIL]
       FAIL
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html.ini
index 68f6d275a6..19bf223829 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media-env-change.html.ini
@@ -1,4 +1,4 @@
 [resource-selection-source-media-env-change.html]
   [the <source> media attribute: no reaction to environment change]
     expected:
-      if asan and not fission: [PASS, FAIL]
+      if not tsan and asan and not fission: [PASS, FAIL]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html.ini
index 39e6389991..e10b7f181f 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-mutable-fragment.html.ini
@@ -1,10 +1,12 @@
 [track-cue-mutable-fragment.html]
   expected:
-    if (os == "linux") and debug and not fission and not swgl: TIMEOUT
-    if (os == "linux") and debug and fission: [OK, TIMEOUT]
-    if (os == "linux") and not debug: [OK, TIMEOUT]
+    if (os == "linux") and not fission and not debug and asan: [OK, TIMEOUT]
+    if (os == "linux") and not fission and not debug and not asan: [TIMEOUT, OK]
+    if (os == "linux") and not fission and debug: [OK, TIMEOUT]
+    if (os == "linux") and fission: [OK, TIMEOUT]
   [Cue fragment is mutable]
     expected:
-      if (os == "linux") and debug and not fission and not swgl: TIMEOUT
-      if (os == "linux") and debug and fission: [PASS, TIMEOUT]
-      if (os == "linux") and not debug: [PASS, TIMEOUT]
+      if (os == "linux") and not fission and not debug and asan: [PASS, TIMEOUT]
+      if (os == "linux") and not fission and not debug and not asan: [TIMEOUT, PASS]
+      if (os == "linux") and not fission and debug: [PASS, TIMEOUT]
+      if (os == "linux") and fission: [PASS, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html.ini
index b0d48fef3b..b4dbc800df 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html.ini
@@ -1,4 +1,4 @@
-[iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html]
+[iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html]
   expected:
     if (os == "linux") and not fission: [OK, TIMEOUT]
     if (os == "android") and fission: [TIMEOUT, OK]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html.ini
index 2483b6391c..773edf42b7 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html.ini
@@ -1,3 +1,3 @@
-[iframe_sandbox_window_open_download_allow_downloads.tentative.html]
+[iframe_sandbox_window_open_download_allow_downloads.tentative.https.html]
   expected:
     if (os == "android") and fission: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-cross-origin.tentative.sub.window.js.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-cross-origin.tentative.sub.window.js.ini
new file mode 100644
index 0000000000..54482a4faa
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-cross-origin.tentative.sub.window.js.ini
@@ -0,0 +1,7 @@
+[sandbox-top-navigation-child-cross-origin.tentative.sub.window.html]
+  expected:
+    if (processor == "x86") and (os == "linux"): [OK, TIMEOUT]
+  [A cross-origin frame with delivered sandbox flags can not navigate top]
+    expected:
+      if (processor == "x86") and (os == "linux"): [FAIL, TIMEOUT]
+      FAIL
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
deleted file mode 100644
index 5a6cd16fbb..0000000000
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[sandbox-top-navigation-child-special-cases.tentative.sub.window.html]
-  expected:
-    if (os == "android") and fission: [ERROR, TIMEOUT]
-    TIMEOUT
-  [Allow top with user activation + user activation]
-    expected: TIMEOUT
-
-  [allow-top-navigation-by-user-activation set but no sticky activation]
-    expected: NOTRUN
-
-  [A cross-origin frame with frame sandbox flags can navigate top]
-    expected: NOTRUN
-
-  [A cross-origin frame with delivered sandbox flags can not navigate top]
-    expected: NOTRUN
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js.ini
index 285b69c4f7..f60114975a 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child.tentative.sub.window.js.ini
@@ -1,4 +1,22 @@
 [sandbox-top-navigation-child.tentative.sub.window.html]
   expected:
-    if os == "win": [CRASH, TIMEOUT]
-    CRASH
+    if os == "win": [TIMEOUT, CRASH]
+    TIMEOUT
+  [A frame with both top navigation frame sandbox flags uses the less     restrictive one]
+    expected: NOTRUN
+
+  [A frame with both top navigation delivered sandbox flags uses the less     restrictive one]
+    expected:
+      if os == "android": [NOTRUN, TIMEOUT]
+      NOTRUN
+
+  [A same-origin frame with frame sandbox flags can navigate top]
+    expected:
+      if os == "mac": [TIMEOUT, PASS]
+      if os == "linux": [TIMEOUT, PASS]
+
+  [A same-origin unsandboxed frame can navigate top]
+    expected:
+      if os == "win": TIMEOUT
+      if os == "android": [TIMEOUT, PASS]
+      [NOTRUN, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-cross-site.tentative.sub.window.js.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-cross-site.tentative.sub.window.js.ini
new file mode 100644
index 0000000000..299cab92fd
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-cross-site.tentative.sub.window.js.ini
@@ -0,0 +1,10 @@
+[sandbox-top-navigation-cross-site.tentative.sub.window.html]
+  expected: TIMEOUT
+  [A cross-site unsandboxed iframe navigation consumes user activation and disallows top-level navigation.]
+    expected: TIMEOUT
+
+  [A same-site unsandboxed iframe navigation does not consume user activation and allows top-level navigation.]
+    expected: NOTRUN
+
+  [A same-site unsandboxed iframe navigation without sticky user activation does not allow top-level navigation.]
+    expected: NOTRUN
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini
index 2b0ef4d222..6d183b527f 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini
@@ -1,4 +1,26 @@
 [sandbox-top-navigation-escalate-privileges.tentative.sub.window.html]
-  expected:
-    if (os == "android") and fission: [ERROR, TIMEOUT]
-    CRASH
+  expected: TIMEOUT
+  [A cross origin unsandboxed frame can't escalate privileges in a child     frame]
+    expected:
+      if os == "mac": [FAIL, TIMEOUT]
+      if os == "linux": [FAIL, TIMEOUT]
+      FAIL
+
+  [A sandboxed same-origin grandchild without allow-same-origin can't     escalate its own top-nav privileges]
+    expected: NOTRUN
+
+  [A same-origin grandchild with frame allow-top can navigate top]
+    expected:
+      if os == "win": [TIMEOUT, NOTRUN]
+      if os == "linux": [NOTRUN, TIMEOUT]
+      if os == "android": TIMEOUT
+      NOTRUN
+
+  [An unsandboxed grandchild inherits its parents ability to navigate top.]
+    expected:
+      if os == "win": [PASS, TIMEOUT]
+      if os == "mac": [TIMEOUT, NOTRUN]
+      if os == "linux": [TIMEOUT, NOTRUN, PASS]
+
+  [A sandboxed same-origin grandchild with allow-same-origin can     give itself top-nav privileges]
+    expected: NOTRUN
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini
index 55c200dd82..2fe0b61401 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini
@@ -1,16 +1,19 @@
 [sandbox-top-navigation-grandchild.tentative.sub.window.html]
   expected:
-    if os == "mac": [TIMEOUT, CRASH]
-    if os == "android": CRASH
-    [CRASH, TIMEOUT]
+    if os == "android": TIMEOUT
+    [TIMEOUT, CRASH]
   [A same-origin sandboxed grandchild in a cross-origin parent can navigate top]
     expected: NOTRUN
 
   [An unsandboxed same-origin grandchild can navigate top]
-    expected: [TIMEOUT, NOTRUN]
+    expected:
+      if os == "android": [PASS, TIMEOUT, NOTRUN]
+      [TIMEOUT, NOTRUN]
 
   [A same-origin grandchild in a cross-origin parent can navigate top]
-    expected: NOTRUN
+    expected:
+      if os == "android": [TIMEOUT, NOTRUN]
+      NOTRUN
 
   [A fully sandboxed same-origin grandchild can't navigate top]
     expected: [PASS, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-user-activation.tentative.sub.window.js.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-user-activation.tentative.sub.window.js.ini
new file mode 100644
index 0000000000..b0ed7c451c
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-user-activation.tentative.sub.window.js.ini
@@ -0,0 +1,7 @@
+[sandbox-top-navigation-user-activation.tentative.sub.window.html]
+  expected: TIMEOUT
+  [Allow top with user activation + user activation]
+    expected: TIMEOUT
+
+  [allow-top-navigation-by-user-activation set but no sticky activation]
+    expected: NOTRUN