From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../meta/content-security-policy/media-src/media-src-7_2.html.ini | 1 + .../meta/content-security-policy/media-src/media-src-7_3.sub.html.ini | 2 +- .../content-security-policy/media-src/media-src-blocked.sub.html.ini | 2 +- .../media-src/media-src-redir-bug.sub.html.ini | 2 +- .../reporting/report-only-cross-origin-frame.sub.html.ini | 4 ++++ 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 testing/web-platform/meta/content-security-policy/reporting/report-only-cross-origin-frame.sub.html.ini (limited to 'testing/web-platform/meta/content-security-policy') diff --git a/testing/web-platform/meta/content-security-policy/media-src/media-src-7_2.html.ini b/testing/web-platform/meta/content-security-policy/media-src/media-src-7_2.html.ini index cd144a3baf..4555a567d7 100644 --- a/testing/web-platform/meta/content-security-policy/media-src/media-src-7_2.html.ini +++ b/testing/web-platform/meta/content-security-policy/media-src/media-src-7_2.html.ini @@ -1,6 +1,7 @@ [media-src-7_2.html] expected: if (os == "mac") and not debug: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, CRASH] [In-policy audio src] expected: if (os == "mac") and not debug: [PASS, NOTRUN] diff --git a/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3.sub.html.ini b/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3.sub.html.ini index 224ffd5420..8958a6cf8f 100644 --- a/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3.sub.html.ini +++ b/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3.sub.html.ini @@ -1,3 +1,3 @@ [media-src-7_3.sub.html] expected: - if (os == "android") and fission: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, ERROR] diff --git a/testing/web-platform/meta/content-security-policy/media-src/media-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/media-src/media-src-blocked.sub.html.ini index 1294746caf..700324bc42 100644 --- a/testing/web-platform/meta/content-security-policy/media-src/media-src-blocked.sub.html.ini +++ b/testing/web-platform/meta/content-security-policy/media-src/media-src-blocked.sub.html.ini @@ -1,3 +1,3 @@ [media-src-blocked.sub.html] expected: - if (os == "android") and fission: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, CRASH] diff --git a/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini b/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini index b0f310359b..6c9375b7e0 100644 --- a/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini +++ b/testing/web-platform/meta/content-security-policy/media-src/media-src-redir-bug.sub.html.ini @@ -1,3 +1,3 @@ [media-src-redir-bug.sub.html] expected: - if (os == "android") and fission: [OK, TIMEOUT] + if (os == "android") and not debug: [OK, ERROR] diff --git a/testing/web-platform/meta/content-security-policy/reporting/report-only-cross-origin-frame.sub.html.ini b/testing/web-platform/meta/content-security-policy/reporting/report-only-cross-origin-frame.sub.html.ini new file mode 100644 index 0000000000..7e6c71e386 --- /dev/null +++ b/testing/web-platform/meta/content-security-policy/reporting/report-only-cross-origin-frame.sub.html.ini @@ -0,0 +1,4 @@ +[report-only-cross-origin-frame.sub.html] + [Violation report status OK.] + expected: + if (processor == "x86") and debug: [PASS, FAIL] -- cgit v1.2.3