Bug 1860492 - Stop using theora files in toolkit/. r=mossop,anti-tracking-reviewers,timhuang

Files containing theora have been modified to use VP9 in WebM, which is
equivalent for those tests, that only require a video with or without sound.

Differential Revision: https://phabricator.services.mozilla.com/D204642
This commit is contained in:
Paul Adenot 2024-04-03 11:11:43 +00:00
parent 4560a98b40
commit fa6bbac3f5
29 changed files with 25 additions and 25 deletions

View file

@ -105,7 +105,7 @@ add_task(async function () {
// The CSS cache needs to be cleared in-process. // The CSS cache needs to be cleared in-process.
content.windowUtils.clearSharedStyleSheetCache(); content.windowUtils.clearSharedStyleSheetCache();
let videoURL = arg.urlPrefix + "file_thirdPartyChild.video.ogv"; let videoURL = arg.urlPrefix + "file_thirdPartyChild.video.webm";
let audioURL = arg.urlPrefix + "file_thirdPartyChild.audio.ogg"; let audioURL = arg.urlPrefix + "file_thirdPartyChild.audio.ogg";
let URLSuffix = "?r=" + arg.randomSuffix; let URLSuffix = "?r=" + arg.randomSuffix;
@ -176,7 +176,7 @@ add_task(async function () {
"xhr.html", "xhr.html",
"worker.xhr.html", "worker.xhr.html",
"audio.ogg", "audio.ogg",
"video.ogv", "video.webm",
"fetch.html", "fetch.html",
"worker.fetch.html", "worker.fetch.html",
"request.html", "request.html",

View file

@ -1,6 +1,6 @@
<html> <html>
<body> <body>
<img src="https://example.net/browser/toolkit/components/antitracking/test/browser/raptor.jpg" id="image1"> <img src="https://example.net/browser/toolkit/components/antitracking/test/browser/raptor.jpg" id="image1">
<video src="https://example.net/browser/toolkit/components/antitracking/test/browser/file_video.ogv" id="video1"> </video> <video src="https://example.net/browser/toolkit/components/antitracking/test/browser/vp9.webm" id="video1"> </video>
</body> </body>
</html> </html>

Binary file not shown.

View file

@ -6,6 +6,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head> </head>
<body> <body>
<video src='320x240.ogv'></video> <video src='320x240.webm'></video>
</body> </body>
</html> </html>

View file

@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
support-files = [ support-files = [
"320x240.ogv", "320x240.webm",
"bug449141_page.html", "bug449141_page.html",
"bug1170334_iframe.xml", "bug1170334_iframe.xml",
"bug1170334_style.css", "bug1170334_style.css",

View file

@ -43,7 +43,7 @@ var progressListener = {
var videoFile = getTempDir(); var videoFile = getTempDir();
videoFile.append(this.dirName); videoFile.append(this.dirName);
dirExists = videoFile.exists(); dirExists = videoFile.exists();
videoFile.append("320x240.ogv"); videoFile.append("320x240.webm");
videoExists = videoFile.exists(); videoExists = videoFile.exists();
this.folder.remove(true); this.folder.remove(true);
this.file.remove(false); this.file.remove(false);

View file

@ -5,7 +5,7 @@ support-files = [
"popup_shared.js", "popup_shared.js",
"window_label_checkbox.xhtml", "window_label_checkbox.xhtml",
"window_menubar.xhtml", "window_menubar.xhtml",
"seek_with_sound.ogg", "seek_with_sound.webm",
] ]
prefs = ["app.support.baseURL='https://support.mozilla.org/'"] prefs = ["app.support.baseURL='https://support.mozilla.org/'"]
@ -63,7 +63,7 @@ skip-if = [
["test_videocontrols_focus.html"] ["test_videocontrols_focus.html"]
support-files = [ support-files = [
"head.js", "head.js",
"video.ogg", "video.webm",
] ]
skip-if = [ skip-if = [
"os == 'android'", "os == 'android'",

View file

@ -1,2 +1,2 @@
<video src="seek_with_sound.ogg" controls autoplay=true></video> <video src="seek_with_sound.webm" controls autoplay=true></video>
<script>window.testExpando = true;</script> <script>window.testExpando = true;</script>

View file

@ -5,8 +5,8 @@ support-files = [
"file_videocontrols_jsdisabled.html", "file_videocontrols_jsdisabled.html",
"image.png", "image.png",
"image-zh.png", "image-zh.png",
"seek_with_sound.ogg", "seek_with_sound.webm",
"video.ogg", "video.webm",
"head.js", "head.js",
"tree_shared.js", "tree_shared.js",
"test-webvtt-1.vtt", "test-webvtt-1.vtt",

Binary file not shown.

View file

@ -184,7 +184,7 @@ add_task(async function setup() {
]}); ]});
await new Promise(resolve => { await new Promise(resolve => {
video.addEventListener("canplaythrough", resolve, {once: true}); video.addEventListener("canplaythrough", resolve, {once: true});
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
}); });
video.addEventListener("play", captureEventThenCheck); video.addEventListener("play", captureEventThenCheck);

View file

@ -49,7 +49,7 @@
["media.videocontrols.keyboard-tab-to-all-controls", true], ["media.videocontrols.keyboard-tab-to-all-controls", true],
]}, done); ]}, done);
}, done => { }, done => {
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
video.addEventListener("loadedmetadata", done); video.addEventListener("loadedmetadata", done);
}, cleanup); }, cleanup);

View file

@ -27,7 +27,7 @@
add_task(async function check_normal_status() { add_task(async function check_normal_status() {
await new Promise(resolve => { await new Promise(resolve => {
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve)); video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve));
}); });
@ -44,7 +44,7 @@
const errorType = "errorNoSource"; const errorType = "errorNoSource";
await new Promise(resolve => { await new Promise(resolve => {
video.src = "invalid_source.ogg"; video.src = "invalid_source.webm";
video.addEventListener("error", () => SimpleTest.executeSoon(resolve)); video.addEventListener("error", () => SimpleTest.executeSoon(resolve));
}); });

View file

@ -36,7 +36,7 @@ add_task(async function setup() {
video.controls = true; video.controls = true;
video.preload = "auto"; video.preload = "auto";
video.loop = true; video.loop = true;
video.src = "video.ogg"; video.src = "video.webm";
const caption = video.addTextTrack("captions", "English", "en"); const caption = video.addTextTrack("captions", "English", "en");
caption.mode = "showing"; caption.mode = "showing";
const content = document.getElementById("content"); const content = document.getElementById("content");

View file

@ -30,7 +30,7 @@
ifr.addEventListener("load", resolve); ifr.addEventListener("load", resolve);
}).then(() => new Promise(resolve => { }).then(() => new Promise(resolve => {
video = ifr.contentDocument.getElementById("video"); video = ifr.contentDocument.getElementById("video");
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
video.addEventListener("loadedmetadata", resolve); video.addEventListener("loadedmetadata", resolve);
})).then(() => new Promise(resolve => { })).then(() => new Promise(resolve => {
const available = video.ownerDocument.fullscreenEnabled; const available = video.ownerDocument.fullscreenEnabled;

View file

@ -31,7 +31,7 @@
["media.videocontrols.keyboard-tab-to-all-controls", true], ["media.videocontrols.keyboard-tab-to-all-controls", true],
]}, done); ]}, done);
}, done => { }, done => {
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
video.addEventListener("loadedmetadata", done); video.addEventListener("loadedmetadata", done);
}); });

View file

@ -22,7 +22,7 @@ var video = document.getElementById("video");
function startMediaLoad() { function startMediaLoad() {
// Kick off test once video has loaded, in its canplaythrough event handler. // Kick off test once video has loaded, in its canplaythrough event handler.
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
video.addEventListener("canplaythrough", runTest); video.addEventListener("canplaythrough", runTest);
} }

View file

@ -26,7 +26,7 @@ const video = document.getElementById("video");
add_task(async function setup() { add_task(async function setup() {
await new Promise(resolve => { await new Promise(resolve => {
video.addEventListener("canplaythrough", resolve, {once: true}); video.addEventListener("canplaythrough", resolve, {once: true});
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
}); });
// Check initial state upon load // Check initial state upon load

View file

@ -13,7 +13,7 @@
<p id="display"></p> <p id="display"></p>
<div id="content"> <div id="content">
<video width="320" height="240" id="video" mozNoDynamicControls controls="true" preload="none" src="seek_with_sound.ogg"></video> <video width="320" height="240" id="video" mozNoDynamicControls controls="true" preload="none" src="seek_with_sound.webm"></video>
</div> </div>
<div id="host"></div> <div id="host"></div>

View file

@ -148,7 +148,7 @@
testCases.push(() => Promise.all(videoElems.map(video => new Promise(resolve => { testCases.push(() => Promise.all(videoElems.map(video => new Promise(resolve => {
video.addEventListener("loadedmetadata", resolve); video.addEventListener("loadedmetadata", resolve);
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
})))); }))));
videoElems.forEach(video => { videoElems.forEach(video => {

View file

@ -22,7 +22,7 @@ function getMediaElement(aWindow) {
return aWindow.document.getElementsByTagName("video")[0]; return aWindow.document.getElementsByTagName("video")[0];
} }
var popup = window.open("seek_with_sound.ogg"); var popup = window.open("seek_with_sound.webm");
popup.addEventListener("load", function() { popup.addEventListener("load", function() {
var video = getMediaElement(popup); var video = getMediaElement(popup);

View file

@ -23,7 +23,7 @@
add_task(async function setup() { add_task(async function setup() {
await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]}); await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]});
await new Promise(resolve => { await new Promise(resolve => {
video.src = "video.ogg"; video.src = "video.webm";
video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve)); video.addEventListener("loadedmetadata", () => SimpleTest.executeSoon(resolve));
}); });
}); });

View file

@ -26,7 +26,7 @@
add_task(async function wait_for_media_ready() { add_task(async function wait_for_media_ready() {
await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]}); await SpecialPowers.pushPrefEnv({"set": [["media.cache_size", 40000]]});
await new Promise(resolve => { await new Promise(resolve => {
video.src = "seek_with_sound.ogg"; video.src = "seek_with_sound.webm";
video.addEventListener("loadedmetadata", resolve); video.addEventListener("loadedmetadata", resolve);
}); });
}); });

Binary file not shown.