summaryrefslogtreecommitdiffstats
path: root/dom/media/webvtt
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:27 +0000
commit40a355a42d4a9444dc753c04c6608dade2f06a23 (patch)
tree871fc667d2de662f171103ce5ec067014ef85e61 /dom/media/webvtt
parentAdding upstream version 124.0.1. (diff)
downloadfirefox-40a355a42d4a9444dc753c04c6608dade2f06a23.tar.xz
firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.zip
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/media/webvtt')
-rw-r--r--dom/media/webvtt/WebVTTListener.cpp2
-rw-r--r--dom/media/webvtt/test/mochitest/manifest.js2
-rw-r--r--dom/media/webvtt/test/mochitest/mochitest.toml12
-rw-r--r--dom/media/webvtt/update-webvtt.js4
4 files changed, 8 insertions, 12 deletions
diff --git a/dom/media/webvtt/WebVTTListener.cpp b/dom/media/webvtt/WebVTTListener.cpp
index 3f8d99a8f3..b0691491e3 100644
--- a/dom/media/webvtt/WebVTTListener.cpp
+++ b/dom/media/webvtt/WebVTTListener.cpp
@@ -65,7 +65,7 @@ nsresult WebVTTListener::LoadResource() {
if (IsCanceled()) {
return NS_OK;
}
- // Exit if we failed to create the WebVTTParserWrapper (vtt.jsm)
+ // Exit if we failed to create the WebVTTParserWrapper (vtt.sys.mjs)
NS_ENSURE_SUCCESS(mParserWrapperError, mParserWrapperError);
mElement->SetReadyState(TextTrackReadyState::Loading);
diff --git a/dom/media/webvtt/test/mochitest/manifest.js b/dom/media/webvtt/test/mochitest/manifest.js
index 91c481feb9..dc72b55ffa 100644
--- a/dom/media/webvtt/test/mochitest/manifest.js
+++ b/dom/media/webvtt/test/mochitest/manifest.js
@@ -11,7 +11,7 @@ function removeNodeAndSource(n) {
}
function once(target, name, cb) {
- var p = new Promise(function (resolve, reject) {
+ var p = new Promise(function (resolve) {
target.addEventListener(
name,
function () {
diff --git a/dom/media/webvtt/test/mochitest/mochitest.toml b/dom/media/webvtt/test/mochitest/mochitest.toml
index 6ec6042407..6fd4c9e7ba 100644
--- a/dom/media/webvtt/test/mochitest/mochitest.toml
+++ b/dom/media/webvtt/test/mochitest/mochitest.toml
@@ -18,15 +18,14 @@ support-files = [
["test_bug883173.html"]
skip-if = [
- "android_version == '25' && debug", # android(bug 1232305)
- "os == 'linux' && (asan || tsan || debug)", # Bug 1829511
+ "os == 'linux' && os_version == '18.04' && asan", # Bug 1829511
+ "os == 'linux' && os_version == '18.04' && tsan", # Bug 1829511
+ "os == 'linux' && os_version == '18.04' && debug", # Bug 1829511
]
["test_bug895091.html"]
-skip-if = ["android_version == '25' && debug"] # android(bug 1232305)
["test_bug957847.html"]
-skip-if = ["android_version == '25' && debug"] # android(bug 1232305)
["test_bug1018933.html"]
@@ -39,10 +38,7 @@ skip-if = ["android_version == '25' && debug"] # android(bug 1232305)
["test_texttrack_cors_preload_none.html"]
["test_texttrack_mode_change_during_loading.html"]
-skip-if = [
- "true",
- "os == 'android'", # Bug 1636572, android(bug 1562021)
-]
+skip-if = ["true"]
["test_texttrack_moz.html"]
diff --git a/dom/media/webvtt/update-webvtt.js b/dom/media/webvtt/update-webvtt.js
index 20a3e2669f..8350cff5dc 100644
--- a/dom/media/webvtt/update-webvtt.js
+++ b/dom/media/webvtt/update-webvtt.js
@@ -6,7 +6,7 @@ var gift = require("gift"),
fs = require("fs"),
argv = require("optimist")
.usage(
- "Update vtt.jsm with the latest from a vtt.js directory.\nUsage:" +
+ "Update vtt.sys.mjs with the latest from a vtt.js directory.\nUsage:" +
" $0 -d [dir]"
)
.demand("d")
@@ -22,7 +22,7 @@ var gift = require("gift"),
.options("w", {
alias: "write",
describe: "Path to file to write to.",
- default: "./vtt.jsm",
+ default: "./vtt.sys.mjs",
}).argv;
var repo = gift(argv.d);