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 --- toolkit/components/windowcreator/test/320x240.ogv | Bin 28942 -> 0 bytes toolkit/components/windowcreator/test/320x240.webm | Bin 0 -> 50163 bytes .../components/windowcreator/test/bug449141_page.html | 2 +- toolkit/components/windowcreator/test/chrome.toml | 2 +- .../components/windowcreator/test/test_bug449141.html | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 toolkit/components/windowcreator/test/320x240.ogv create mode 100644 toolkit/components/windowcreator/test/320x240.webm (limited to 'toolkit/components/windowcreator') diff --git a/toolkit/components/windowcreator/test/320x240.ogv b/toolkit/components/windowcreator/test/320x240.ogv deleted file mode 100644 index 093158432a..0000000000 Binary files a/toolkit/components/windowcreator/test/320x240.ogv and /dev/null differ diff --git a/toolkit/components/windowcreator/test/320x240.webm b/toolkit/components/windowcreator/test/320x240.webm new file mode 100644 index 0000000000..16ecdbf688 Binary files /dev/null and b/toolkit/components/windowcreator/test/320x240.webm differ diff --git a/toolkit/components/windowcreator/test/bug449141_page.html b/toolkit/components/windowcreator/test/bug449141_page.html index 3b8e3f550a..4c8e46dd10 100644 --- a/toolkit/components/windowcreator/test/bug449141_page.html +++ b/toolkit/components/windowcreator/test/bug449141_page.html @@ -6,6 +6,6 @@ -

diff --git a/toolkit/components/windowcreator/test/chrome.toml b/toolkit/components/windowcreator/test/chrome.toml index 0fdc8250e0..8afd9acbe5 100644 --- a/toolkit/components/windowcreator/test/chrome.toml +++ b/toolkit/components/windowcreator/test/chrome.toml @@ -1,6 +1,6 @@ [DEFAULT] support-files = [ - "320x240.ogv", + "320x240.webm", "bug449141_page.html", "bug1170334_iframe.xml", "bug1170334_style.css", diff --git a/toolkit/components/windowcreator/test/test_bug449141.html b/toolkit/components/windowcreator/test/test_bug449141.html index f178689599..24963295a0 100644 --- a/toolkit/components/windowcreator/test/test_bug449141.html +++ b/toolkit/components/windowcreator/test/test_bug449141.html @@ -35,7 +35,7 @@ var progressListener = { onProgressChange() { /* Ignore progress callback */ }, - onStateChange(aProgress, aRequest, aStateFlag, aStatus) { + onStateChange(aProgress, aRequest, aStateFlag) { if (aStateFlag & STATE_STOP) { var dirExists = false; var videoExists = false; @@ -43,7 +43,7 @@ var progressListener = { var videoFile = getTempDir(); videoFile.append(this.dirName); dirExists = videoFile.exists(); - videoFile.append("320x240.ogv"); + videoFile.append("320x240.webm"); videoExists = videoFile.exists(); this.folder.remove(true); this.file.remove(false); -- cgit v1.2.3