diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /testing/web-platform/tests/content-security-policy | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/tests/content-security-policy')
7 files changed, 21 insertions, 21 deletions
diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html index 8fd094e955..9cf142185a 100644 --- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html +++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1.html @@ -35,14 +35,14 @@ <video id="videoObject" width="320" height="240" controls onloadeddata="media_loaded(source_test)"> <source id="videoSourceObject" - type="video/ogg" + type="video/webm" onerror="media_error_handler(source_test)" - src="/media/A4.ogv"> + src="/media/A4.webm"> </video> <video id="videoObject2" width="320" height="240" controls onerror="media_error_handler(src_test)" onloadeddata="media_loaded(src_test)" - src="/media/A4.ogv"> + src="/media/A4.webm"> </body> </html> diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html index 8312defb2e..579668c83e 100644 --- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html +++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_1_2.sub.html @@ -24,7 +24,7 @@ })); // we assume tests are run from 'hostname' and 'www.hostname' or 'www2.hostname' is a valid alias - var mediaURL = location.protocol + "//{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv"; + var mediaURL = location.protocol + "//{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm"; function media_loaded(t) { t.step( function () { @@ -41,7 +41,7 @@ <video id="videoObject" width="320" height="240" controls onloadeddata="media_loaded(source_test)"> <source id="videoSourceObject" - type="video/ogg" + type="video/webm" onerror="media_error_handler(source_test)"> </video> <video id="videoObject2" width="320" height="240" controls diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html index ce6b8add3c..e1627b138c 100644 --- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html +++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_2_2.sub.html @@ -48,7 +48,7 @@ <script> let source = document.createElement("source"); source.src = mediaURL; - source.type = "audio/ogg"; + source.type = "audio/webm"; source.onerror = _ => { media_error_handler(source_test); } document.getElementById("audioObject").appendChild(source); document.getElementById("audioObject2").src = mediaURL; diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html index 46489e2668..2acae07b7e 100644 --- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html +++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3.sub.html @@ -37,8 +37,8 @@ <video id="videoObject" width="320" height="240" controls onloadeddata="media_loaded(source_test)" crossorigin> <source id="audioSourceObject" - type="audio/ogg" - src="/media/A4.ogv"> + type="video/webm" + src="/media/A4.webm"> <track id="trackObject" kind="subtitles" srclang="en" diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html index 431a58608a..cb3558e6c2 100644 --- a/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html +++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-7_3_2.sub.html @@ -43,8 +43,8 @@ onerror="media_error_handler(source_test)" crossorigin> <source id="audioSourceObject" - type="audio/ogg" - src="/media/A4.ogv"> + type="video/webm" + src="/media/A4.webm"> <track default id="trackObject" kind="subtitles" diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html index b2b57dec64..16c36dfb20 100644 --- a/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html +++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-blocked.sub.html @@ -14,7 +14,7 @@ <script> const otherOrigin = get_host_info().OTHER_ORIGIN; const audioUrl = otherOrigin + "/media/sound_5.oga"; - const videoUrl = otherOrigin + "/media/A4.ogv"; + const videoUrl = otherOrigin + "/media/A4.webm"; // Asynchronously returns the next `securitypolicyviolation` event. async function nextViolation() { @@ -29,7 +29,7 @@ const violationPromise = nextViolation(); const video = document.createElement("video"); - video.type = "video/ogg"; + video.type = "video/webm"; video.src = videoUrl; video.onloadeddata = reject; video.onerror = () => { resolve(violationPromise); }; @@ -49,7 +49,7 @@ video.onloadeddata = reject; const source = document.createElement("source"); - source.type = "video/ogg"; + source.type = "video/webm"; source.src = videoUrl; source.onerror = () => { resolve(violationPromise); }; @@ -64,7 +64,7 @@ const violationPromise = nextViolation(); const audio = document.createElement("audio"); - audio.type = "audio/ogg"; + audio.type = "audio/webm"; audio.src = audioUrl; audio.oncanplay = reject; audio.onloadedmetadata = reject; @@ -86,7 +86,7 @@ audio.onloadeddata = reject; const source = document.createElement("source"); - source.type = "audio/ogg"; + source.type = "audio/webm"; source.src = audioUrl; source.onerror = () => { resolve(violationPromise); }; diff --git a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html index a0708bf5ed..ac8c167d5f 100644 --- a/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html +++ b/testing/web-platform/tests/content-security-policy/media-src/media-src-redir-bug.sub.html @@ -44,28 +44,28 @@ <video id="videoObject" width="320" height="240" controls onloadeddata="media_loaded(source_test)"> <source id="videoSourceObject" - type="video/ogg" + type="video/webm" onerror="media_error_handler(source_test)" - src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv"> + src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm"> </video> <video id="videoObject2" width="320" height="240" controls onerror="media_error_handler(src_test)" onloadeddata="media_loaded(src_test)" - src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv"> + src="http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm"> <video id="videoObject3" width="320" height="240" controls onloadeddata="media_loaded(source_redir_test)"> <source id="videoSourceObject" - type="video/ogg" + type="video/webm" onerror="media_error_handler(source_test)" - src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv"> + src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm"> </video> <video id="videoObject2" width="320" height="240" controls onerror="media_error_handler(src_redir_test)" onloadeddata="media_loaded(src_redir_test)" - src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.ogv"> + src="/common/redirect.py?location=http://{{domains[www2]}}:{{ports[http][0]}}/media/A4.webm"> </body> </html> |