From e3df66c4e8691e1710cd9be118f9721f119ec86b Mon Sep 17 00:00:00 2001 From: Narcis Beleuzu Date: Thu, 4 Apr 2024 01:43:26 +0300 Subject: [PATCH] Backed out 14 changesets (bug 1860492) for mda failure on test_closing_connections Backed out changeset 9b8435c1c982 (bug 1860492) Backed out changeset 08603e5ea8a0 (bug 1860492) Backed out changeset 93086bc64d37 (bug 1860492) Backed out changeset f8cbb9933469 (bug 1860492) Backed out changeset f5e2a92235f1 (bug 1860492) Backed out changeset 0038d6d54690 (bug 1860492) Backed out changeset 24a1fb93d4a8 (bug 1860492) Backed out changeset c2c11ee3f79f (bug 1860492) Backed out changeset 9983c1ddee85 (bug 1860492) Backed out changeset b9286e049dea (bug 1860492) Backed out changeset d1d98783c88d (bug 1860492) Backed out changeset 22dd17861e80 (bug 1860492) Backed out changeset 7d823668fba7 (bug 1860492) Backed out changeset 024863677345 (bug 1860492) --- .prettierignore | 1 + .../content/test/contextMenu/browser.toml | 2 +- .../test/contextMenu/browser_contextmenu.js | 2 +- .../test/contextMenu/subtst_contextmenu.html | 4 +- .../subtst_contextmenu_webext.html | 2 +- .../base/content/test/general/browser.toml | 15 +- .../content/test/general/browser_bug676619.js | 8 +- .../test/general/browser_save_video.js | 2 +- .../content/test/general/download_page.html | 10 +- browser/base/content/test/general/video.ogg | Bin 0 -> 285310 bytes browser/base/content/test/general/video.webm | Bin 222879 -> 0 bytes .../base/content/test/general/web_video.html | 2 +- .../base/content/test/general/web_video1.ogv | Bin 0 -> 28942 bytes .../test/general/web_video1.ogv^headers^ | 3 + .../base/content/test/general/web_video1.webm | Bin 17555 -> 0 bytes .../test/general/web_video1.webm^headers^ | 3 - .../base/content/test/pageinfo/browser.toml | 2 +- browser/base/content/test/pageinfo/image.html | 2 +- browser/base/content/test/zoom/browser.toml | 2 +- .../zoom/browser_sitespecific_video_zoom.js | 2 +- .../test/browser/browser.toml | 2 +- .../test/browser/browser_cache.js | 4 +- .../browser_firstPartyIsolation_saveAs.js | 2 +- .../test/browser/file_saveAs.sjs | 4 +- .../browser/file_thirdPartyChild.video.ogv | Bin 0 -> 16049 bytes .../browser/file_thirdPartyChild.video.webm | Bin 17931 -> 0 bytes dom/canvas/test/crossorigin/mochitest.toml | 4 - dom/canvas/test/mochitest.toml | 6 +- dom/canvas/test/test_imagebitmap.html | 4 +- .../test/test_imagebitmap_cropping.html | 4 +- .../test/webgl-mochitest/mochitest.toml | 13 +- .../test/webgl-mochitest/red-green.theora.ogv | Bin 0 -> 10292 bytes .../test_video_fastpath_theora.html | 21 ++ .../test/test_document-element-inserted.html | 2 +- dom/media/MediaDecoderStateMachine.cpp | 20 +- .../autoplay/test/mochitest/mochitest.toml | 2 +- ...lay_policy_play_before_loadedmetadata.html | 4 +- .../mediacontrol/tests/browser/browser.toml | 1 + .../tests/browser/file_error_media.html | 2 +- dom/media/ogg/OggDecoder.cpp | 10 +- .../agnostic/AgnosticDecoderModule.cpp | 12 +- dom/media/test/320x240.ogv | Bin 0 -> 28942 bytes ...240.webm^headers^ => 320x240.ogv^headers^} | 0 dom/media/test/320x240.webm | Bin 50163 -> 0 bytes dom/media/test/448636.ogv | Bin 0 -> 7799 bytes dom/media/test/bogus.ogv | 45 +++ dom/media/test/bug482461-theora.ogv | Bin 0 -> 280904 bytes dom/media/test/bug482461.ogv | Bin 0 -> 305785 bytes dom/media/test/bug495129.ogv | Bin 0 -> 122207 bytes dom/media/test/bug498380.ogv | Bin 0 -> 65535 bytes dom/media/test/bug498855-1.ogv | Bin 0 -> 20480 bytes dom/media/test/bug498855-2.ogv | Bin 0 -> 20480 bytes dom/media/test/bug498855-3.ogv | Bin 0 -> 20480 bytes dom/media/test/bug499519.ogv | Bin 0 -> 20480 bytes dom/media/test/bug500311.ogv | Bin 0 -> 55834 bytes dom/media/test/bug504613.ogv | Bin 0 -> 35000 bytes dom/media/test/bug504644.ogv | Bin 0 -> 131114 bytes dom/media/test/bug504843.ogv | Bin 0 -> 65536 bytes dom/media/test/bug506094.ogv | Bin 0 -> 8195 bytes dom/media/test/bug516323.indexed.ogv | Bin 0 -> 162193 bytes dom/media/test/bug516323.ogv | Bin 0 -> 161789 bytes dom/media/test/bug523816.ogv | Bin 0 -> 40585 bytes dom/media/test/bug556821.ogv | Bin 0 -> 196608 bytes dom/media/test/bug557094.ogv | Bin 0 -> 76966 bytes dom/media/test/can_play_type_ogg.js | 21 +- dom/media/test/chained-video.ogv | Bin 0 -> 57906 bytes dom/media/test/crashtests/576612-1.html | 15 + dom/media/test/make-headers.sh | 4 +- dom/media/test/manifest.js | 281 +++++++++++++++++- dom/media/test/mochitest.toml | 67 ++++- .../test/mochitest_background_video.toml | 68 +++++ dom/media/test/mochitest_bugs.toml | 68 +++++ dom/media/test/mochitest_compat.toml | 68 +++++ dom/media/test/mochitest_eme.toml | 68 +++++ dom/media/test/mochitest_eme_compat.toml | 68 +++++ dom/media/test/mochitest_media_recorder.toml | 66 ++++ dom/media/test/mochitest_seek.toml | 68 +++++ dom/media/test/mochitest_stream.toml | 76 ++++- dom/media/test/multiple-bos.ogg | Bin 0 -> 33045 bytes dom/media/test/sample-fisbone-skeleton4.ogv | Bin 0 -> 8747 bytes .../test/sample-fisbone-wrong-header.ogv | Bin 0 -> 8703 bytes dom/media/test/seek-short.ogv | Bin 0 -> 79921 bytes dom/media/test/seek.ogv | Bin 0 -> 285310 bytes dom/media/test/seekLies.sjs | 4 +- dom/media/test/short-video.ogv | Bin 0 -> 16049 bytes dom/media/test/test_bug1248229.html | 2 +- dom/media/test/test_closing_connections.html | 2 +- dom/media/test/test_decoder_disable.html | 4 +- .../test/test_error_in_video_document.html | 9 +- dom/media/test/test_load_same_resource.html | 2 +- dom/media/test/test_media_selection.html | 2 +- dom/media/test/test_preload_suspend.html | 2 +- .../test/test_streams_element_capture.html | 5 - .../test_streams_element_capture_twice.html | 2 +- dom/media/test/test_videoDocumentTitle.html | 4 +- ...test_video_stats_resistfingerprinting.html | 1 + dom/media/webaudio/test/mochitest_audio.toml | 1 + .../webaudio/test/test_mediaDecoding.html | 12 + dom/security/test/https-first/browser.toml | 2 +- .../file_mixed_content_auto_upgrade.html | 2 +- dom/security/test/https-first/test.ogv | Bin 0 -> 2344665 bytes dom/security/test/https-first/test.webm | Bin 97465 -> 0 bytes .../test/mixedcontentblocker/browser.toml | 2 +- ...ent_and_mixed_content_display_upgrade.html | 2 +- .../test/mixedcontentblocker/file_server.sjs | 4 +- .../test/mixedcontentblocker/mochitest.toml | 4 +- .../test/mixedcontentblocker/test.ogv | Bin 0 -> 2344665 bytes .../test/mixedcontentblocker/test.webm | Bin 97465 -> 0 bytes layout/generic/crashtests/481921.ogg | Bin 0 -> 42852 bytes layout/reftests/moz.build | 2 + layout/reftests/ogg-video/444-1-ref.html | 20 ++ layout/reftests/ogg-video/444-1.html | 20 ++ .../ogg-video/aspect-ratio-1-ref.html | 6 + .../reftests/ogg-video/aspect-ratio-1a.xhtml | 14 + .../reftests/ogg-video/aspect-ratio-1b.xhtml | 14 + .../ogg-video/aspect-ratio-2-ref.html | 6 + .../reftests/ogg-video/aspect-ratio-2a.xhtml | 14 + .../reftests/ogg-video/aspect-ratio-2b.xhtml | 14 + .../ogg-video/aspect-ratio-3-ref.xhtml | 14 + .../reftests/ogg-video/aspect-ratio-3a.xhtml | 14 + .../reftests/ogg-video/aspect-ratio-3b.xhtml | 14 + layout/reftests/ogg-video/basic-1-ref.html | 6 + layout/reftests/ogg-video/basic-1.xhtml | 14 + .../ogg-video/black100x100-aspect3to2.ogv | Bin 0 -> 3428 bytes layout/reftests/ogg-video/black140x100.ogv | Bin 0 -> 2871 bytes .../reftests/ogg-video/black29x19offset.ogv | Bin 0 -> 3988 bytes layout/reftests/ogg-video/blue140x100.png | Bin 0 -> 277 bytes layout/reftests/ogg-video/blue250x200.png | Bin 0 -> 1157 bytes layout/reftests/ogg-video/canvas-1a.xhtml | 29 ++ layout/reftests/ogg-video/canvas-1b.xhtml | 27 ++ layout/reftests/ogg-video/clipping-1-ref.html | 9 + layout/reftests/ogg-video/clipping-1a.html | 8 + layout/reftests/ogg-video/empty-1-ref.html | 5 + layout/reftests/ogg-video/empty-1a.html | 6 + layout/reftests/ogg-video/empty-1b.html | 6 + .../ogg-video/encoded-aspect-ratio-1-ref.html | 19 ++ .../ogg-video/encoded-aspect-ratio-1.html | 29 ++ layout/reftests/ogg-video/green70x30.png | Bin 0 -> 224 bytes .../ogg-video/object-aspect-ratio-1a.xhtml | 14 + .../ogg-video/object-aspect-ratio-1b.xhtml | 14 + .../ogg-video/object-aspect-ratio-2a.xhtml | 14 + .../ogg-video/object-aspect-ratio-2b.xhtml | 14 + layout/reftests/ogg-video/offset-1-ref.html | 6 + layout/reftests/ogg-video/offset-1.xhtml | 14 + layout/reftests/ogg-video/poster-1.html | 7 + layout/reftests/ogg-video/poster-10.html | 18 ++ layout/reftests/ogg-video/poster-11.html | 29 ++ layout/reftests/ogg-video/poster-12.html | 38 +++ layout/reftests/ogg-video/poster-13.html | 8 + layout/reftests/ogg-video/poster-15.html | 13 + layout/reftests/ogg-video/poster-2.html | 7 + layout/reftests/ogg-video/poster-3.html | 11 + layout/reftests/ogg-video/poster-4.html | 14 + layout/reftests/ogg-video/poster-5.html | 13 + layout/reftests/ogg-video/poster-6.html | 12 + layout/reftests/ogg-video/poster-7.html | 14 + layout/reftests/ogg-video/poster-8.html | 12 + .../ogg-video/poster-ref-black140x100.html | 6 + .../ogg-video/poster-ref-blue125x100.html | 6 + .../ogg-video/poster-ref-blue140x100.html | 6 + .../ogg-video/poster-ref-blue250x200.html | 6 + .../ogg-video/poster-ref-blue400x300.html | 8 + .../ogg-video/poster-ref-green70x30.html | 6 + .../ogg-video/poster-ref-red140x100.html | 6 + layout/reftests/ogg-video/red140x100.png | Bin 0 -> 274 bytes layout/reftests/ogg-video/red160x120.png | Bin 0 -> 720 bytes layout/reftests/ogg-video/reftest.list | 35 +++ layout/reftests/ogg-video/seek420.ogv | Bin 0 -> 30163 bytes layout/reftests/ogg-video/seek444.ogv | Bin 0 -> 30408 bytes layout/reftests/ogg-video/zoomed-1-ref.html | 6 + layout/reftests/ogg-video/zoomed-1.xhtml | 15 + layout/reftests/reftest.list | 3 + .../androidTest/assets/www/badVideoPath.html | 2 +- .../src/androidTest/assets/www/ogg.html | 11 + .../androidTest/assets/www/videos/video.ogg | Bin 0 -> 285310 bytes .../mozilla/geckoview/test/BaseSessionTest.kt | 1 + modules/libpref/init/StaticPrefList.yaml | 6 - testing/docs/mochitest-plain/faq.md | 2 +- ...unsized-media.tentative.https.sub.html.ini | 2 +- .../mime-types/canPlayType.html.ini | 33 +- .../initiator-type/video.html.ini | 2 +- .../copyToTexture/video/cts.https.html.ini | 24 ++ .../external_texture/video/cts.https.html.ini | 30 ++ .../mozilla/tests/media/2x2-green.ogv | Bin 0 -> 7660 bytes .../mozilla/tests/media/2x2-green.webm | Bin 794 -> 0 bytes .../service-workers/resources/fetch_video.py | 4 +- .../mozilla/tests/webgpu/resources/README.md | 3 +- .../resources/four-colors-theora-bt601.ogv | Bin 0 -> 44488 bytes .../tests/webgpu/webgpu/web_platform/util.js | 10 +- ...etSinkId-with-selectAudioOutput.https.html | 2 +- testing/web-platform/tests/common/media.js | 4 + .../media-src/media-src-7_1.html | 6 +- .../media-src/media-src-7_1_2.sub.html | 4 +- .../media-src/media-src-7_2_2.sub.html | 2 +- .../media-src/media-src-7_3.sub.html | 4 +- .../media-src/media-src-7_3_2.sub.html | 4 +- .../media-src/media-src-blocked.sub.html | 10 +- .../media-src/media-src-redir-bug.sub.html | 12 +- .../support/RGB_Circles.oggtheora.ogv | Bin 0 -> 66830 bytes .../clip-path/clip-path-scaled-video.html | 12 +- .../aspect-ratio/support/2x2-green.ogv | Bin 0 -> 7660 bytes .../aspect-ratio/support/2x2-green.webm | Bin 555 -> 0 bytes .../tests/css/css-ui/resize-014.html | 3 + .../tests/css/css-ui/support/test.ogv | Bin 0 -> 287648 bytes .../customized-builtins/HTMLMediaElement.html | 2 +- .../HTMLSourceElement.html | 2 +- .../experimental-features/resources/video.ogv | Bin 0 -> 103746 bytes .../resources/video.webm | Bin 81605 -> 0 bytes .../unsized-media.tentative.https.sub.html | 2 +- .../destination/resources/dummy_video.ogv | Bin 0 -> 94372 bytes .../read-media/cross-origin-video.html | 3 +- .../query-encoding/resources/resolve-url.js | 2 + .../mime-types/canPlayType.html | 6 - .../track/track-element/track-cue-inline.html | 4 +- testing/web-platform/tests/media/A4.ogv | Bin 0 -> 94372 bytes testing/web-platform/tests/media/counting.ogv | Bin 0 -> 187773 bytes .../web-platform/tests/media/green-at-15.ogv | Bin 0 -> 287648 bytes .../web-platform/tests/media/movie_300.ogv | Bin 0 -> 2344665 bytes testing/web-platform/tests/media/movie_5.ogv | Bin 0 -> 18645 bytes testing/web-platform/tests/media/test.ogv | Bin 0 -> 146510 bytes testing/web-platform/tests/media/video.ogv | Bin 0 -> 53189 bytes .../mixed-content-cors.https.sub.html | 4 +- .../autoupgrades/video-upgrade.https.sub.html | 8 +- .../tentative/resources/test.ogv | Bin 0 -> 2344665 bytes .../tentative/resources/test.webm | Bin 19054 -> 0 bytes .../tests/preload/resources/A4.ogv | Bin 0 -> 94372 bytes .../resource-timing/initiator-type/video.html | 4 +- .../resources/request-picture-in-picture.html | 2 +- .../tools/wptserve/wptserve/constants.py | 1 + .../antitracking/test/browser/browser.toml | 4 +- .../browser/browser_staticPartition_cache.js | 4 +- .../test/browser/file_saveAsPageInfo.html | 2 +- .../antitracking/test/browser/file_video.ogv | Bin 0 -> 16049 bytes .../antitracking/test/browser/file_video.webm | Bin 17931 -> 0 bytes .../components/windowcreator/test/320x240.ogv | Bin 0 -> 28942 bytes .../windowcreator/test/320x240.webm | Bin 50163 -> 0 bytes .../windowcreator/test/bug449141_page.html | 2 +- .../components/windowcreator/test/chrome.toml | 2 +- .../windowcreator/test/test_bug449141.html | 2 +- toolkit/content/tests/widgets/chrome.toml | 4 +- .../file_videocontrols_jsdisabled.html | 2 +- toolkit/content/tests/widgets/mochitest.toml | 4 +- .../content/tests/widgets/seek_with_sound.ogg | Bin 0 -> 299507 bytes .../tests/widgets/seek_with_sound.webm | Bin 287370 -> 0 bytes .../tests/widgets/test_videocontrols.html | 2 +- ...est_videocontrols_closed_caption_menu.html | 2 +- .../widgets/test_videocontrols_error.html | 4 +- .../widgets/test_videocontrols_focus.html | 2 +- .../test_videocontrols_iframe_fullscreen.html | 2 +- .../test_videocontrols_keyhandler.html | 2 +- .../test_videocontrols_onclickplay.html | 2 +- .../test_videocontrols_scrubber_position.html | 2 +- ...ocontrols_scrubber_position_nopreload.html | 2 +- .../widgets/test_videocontrols_size.html | 2 +- .../test_videocontrols_standalone.html | 2 +- .../test_videocontrols_video_noaudio.html | 2 +- .../tests/widgets/test_videocontrols_vtt.html | 2 +- toolkit/content/tests/widgets/video.ogg | Bin 0 -> 285310 bytes toolkit/content/tests/widgets/video.webm | Bin 222879 -> 0 bytes 259 files changed, 1939 insertions(+), 263 deletions(-) create mode 100644 browser/base/content/test/general/video.ogg delete mode 100644 browser/base/content/test/general/video.webm create mode 100644 browser/base/content/test/general/web_video1.ogv create mode 100644 browser/base/content/test/general/web_video1.ogv^headers^ delete mode 100644 browser/base/content/test/general/web_video1.webm delete mode 100644 browser/base/content/test/general/web_video1.webm^headers^ create mode 100644 browser/components/originattributes/test/browser/file_thirdPartyChild.video.ogv delete mode 100644 browser/components/originattributes/test/browser/file_thirdPartyChild.video.webm create mode 100644 dom/canvas/test/webgl-mochitest/red-green.theora.ogv create mode 100644 dom/canvas/test/webgl-mochitest/test_video_fastpath_theora.html create mode 100644 dom/media/test/320x240.ogv rename dom/media/test/{320x240.webm^headers^ => 320x240.ogv^headers^} (100%) delete mode 100644 dom/media/test/320x240.webm create mode 100644 dom/media/test/448636.ogv create mode 100644 dom/media/test/bogus.ogv create mode 100644 dom/media/test/bug482461-theora.ogv create mode 100644 dom/media/test/bug482461.ogv create mode 100644 dom/media/test/bug495129.ogv create mode 100644 dom/media/test/bug498380.ogv create mode 100644 dom/media/test/bug498855-1.ogv create mode 100644 dom/media/test/bug498855-2.ogv create mode 100644 dom/media/test/bug498855-3.ogv create mode 100644 dom/media/test/bug499519.ogv create mode 100644 dom/media/test/bug500311.ogv create mode 100644 dom/media/test/bug504613.ogv create mode 100644 dom/media/test/bug504644.ogv create mode 100644 dom/media/test/bug504843.ogv create mode 100644 dom/media/test/bug506094.ogv create mode 100644 dom/media/test/bug516323.indexed.ogv create mode 100644 dom/media/test/bug516323.ogv create mode 100644 dom/media/test/bug523816.ogv create mode 100644 dom/media/test/bug556821.ogv create mode 100644 dom/media/test/bug557094.ogv create mode 100644 dom/media/test/chained-video.ogv create mode 100644 dom/media/test/crashtests/576612-1.html create mode 100644 dom/media/test/multiple-bos.ogg create mode 100644 dom/media/test/sample-fisbone-skeleton4.ogv create mode 100644 dom/media/test/sample-fisbone-wrong-header.ogv create mode 100644 dom/media/test/seek-short.ogv create mode 100644 dom/media/test/seek.ogv create mode 100644 dom/media/test/short-video.ogv create mode 100644 dom/security/test/https-first/test.ogv delete mode 100644 dom/security/test/https-first/test.webm create mode 100644 dom/security/test/mixedcontentblocker/test.ogv delete mode 100644 dom/security/test/mixedcontentblocker/test.webm create mode 100644 layout/generic/crashtests/481921.ogg create mode 100644 layout/reftests/ogg-video/444-1-ref.html create mode 100644 layout/reftests/ogg-video/444-1.html create mode 100644 layout/reftests/ogg-video/aspect-ratio-1-ref.html create mode 100644 layout/reftests/ogg-video/aspect-ratio-1a.xhtml create mode 100644 layout/reftests/ogg-video/aspect-ratio-1b.xhtml create mode 100644 layout/reftests/ogg-video/aspect-ratio-2-ref.html create mode 100644 layout/reftests/ogg-video/aspect-ratio-2a.xhtml create mode 100644 layout/reftests/ogg-video/aspect-ratio-2b.xhtml create mode 100644 layout/reftests/ogg-video/aspect-ratio-3-ref.xhtml create mode 100644 layout/reftests/ogg-video/aspect-ratio-3a.xhtml create mode 100644 layout/reftests/ogg-video/aspect-ratio-3b.xhtml create mode 100644 layout/reftests/ogg-video/basic-1-ref.html create mode 100644 layout/reftests/ogg-video/basic-1.xhtml create mode 100644 layout/reftests/ogg-video/black100x100-aspect3to2.ogv create mode 100644 layout/reftests/ogg-video/black140x100.ogv create mode 100644 layout/reftests/ogg-video/black29x19offset.ogv create mode 100644 layout/reftests/ogg-video/blue140x100.png create mode 100644 layout/reftests/ogg-video/blue250x200.png create mode 100644 layout/reftests/ogg-video/canvas-1a.xhtml create mode 100644 layout/reftests/ogg-video/canvas-1b.xhtml create mode 100644 layout/reftests/ogg-video/clipping-1-ref.html create mode 100644 layout/reftests/ogg-video/clipping-1a.html create mode 100644 layout/reftests/ogg-video/empty-1-ref.html create mode 100644 layout/reftests/ogg-video/empty-1a.html create mode 100644 layout/reftests/ogg-video/empty-1b.html create mode 100644 layout/reftests/ogg-video/encoded-aspect-ratio-1-ref.html create mode 100644 layout/reftests/ogg-video/encoded-aspect-ratio-1.html create mode 100644 layout/reftests/ogg-video/green70x30.png create mode 100644 layout/reftests/ogg-video/object-aspect-ratio-1a.xhtml create mode 100644 layout/reftests/ogg-video/object-aspect-ratio-1b.xhtml create mode 100644 layout/reftests/ogg-video/object-aspect-ratio-2a.xhtml create mode 100644 layout/reftests/ogg-video/object-aspect-ratio-2b.xhtml create mode 100644 layout/reftests/ogg-video/offset-1-ref.html create mode 100644 layout/reftests/ogg-video/offset-1.xhtml create mode 100644 layout/reftests/ogg-video/poster-1.html create mode 100644 layout/reftests/ogg-video/poster-10.html create mode 100644 layout/reftests/ogg-video/poster-11.html create mode 100644 layout/reftests/ogg-video/poster-12.html create mode 100644 layout/reftests/ogg-video/poster-13.html create mode 100644 layout/reftests/ogg-video/poster-15.html create mode 100644 layout/reftests/ogg-video/poster-2.html create mode 100644 layout/reftests/ogg-video/poster-3.html create mode 100644 layout/reftests/ogg-video/poster-4.html create mode 100644 layout/reftests/ogg-video/poster-5.html create mode 100644 layout/reftests/ogg-video/poster-6.html create mode 100644 layout/reftests/ogg-video/poster-7.html create mode 100644 layout/reftests/ogg-video/poster-8.html create mode 100644 layout/reftests/ogg-video/poster-ref-black140x100.html create mode 100644 layout/reftests/ogg-video/poster-ref-blue125x100.html create mode 100644 layout/reftests/ogg-video/poster-ref-blue140x100.html create mode 100644 layout/reftests/ogg-video/poster-ref-blue250x200.html create mode 100644 layout/reftests/ogg-video/poster-ref-blue400x300.html create mode 100644 layout/reftests/ogg-video/poster-ref-green70x30.html create mode 100644 layout/reftests/ogg-video/poster-ref-red140x100.html create mode 100644 layout/reftests/ogg-video/red140x100.png create mode 100644 layout/reftests/ogg-video/red160x120.png create mode 100644 layout/reftests/ogg-video/reftest.list create mode 100644 layout/reftests/ogg-video/seek420.ogv create mode 100644 layout/reftests/ogg-video/seek444.ogv create mode 100644 layout/reftests/ogg-video/zoomed-1-ref.html create mode 100644 layout/reftests/ogg-video/zoomed-1.xhtml create mode 100644 mobile/android/geckoview/src/androidTest/assets/www/ogg.html create mode 100644 mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg create mode 100644 testing/web-platform/mozilla/tests/media/2x2-green.ogv delete mode 100644 testing/web-platform/mozilla/tests/media/2x2-green.webm create mode 100644 testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv create mode 100644 testing/web-platform/tests/css/compositing/mix-blend-mode/support/RGB_Circles.oggtheora.ogv create mode 100644 testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.ogv delete mode 100644 testing/web-platform/tests/css/css-sizing/aspect-ratio/support/2x2-green.webm create mode 100644 testing/web-platform/tests/css/css-ui/support/test.ogv create mode 100644 testing/web-platform/tests/document-policy/experimental-features/resources/video.ogv delete mode 100644 testing/web-platform/tests/document-policy/experimental-features/resources/video.webm create mode 100644 testing/web-platform/tests/fetch/api/request/destination/resources/dummy_video.ogv create mode 100644 testing/web-platform/tests/media/A4.ogv create mode 100644 testing/web-platform/tests/media/counting.ogv create mode 100644 testing/web-platform/tests/media/green-at-15.ogv create mode 100644 testing/web-platform/tests/media/movie_300.ogv create mode 100644 testing/web-platform/tests/media/movie_5.ogv create mode 100644 testing/web-platform/tests/media/test.ogv create mode 100644 testing/web-platform/tests/media/video.ogv create mode 100644 testing/web-platform/tests/mixed-content/tentative/resources/test.ogv delete mode 100644 testing/web-platform/tests/mixed-content/tentative/resources/test.webm create mode 100644 testing/web-platform/tests/preload/resources/A4.ogv create mode 100644 toolkit/components/antitracking/test/browser/file_video.ogv delete mode 100644 toolkit/components/antitracking/test/browser/file_video.webm create mode 100644 toolkit/components/windowcreator/test/320x240.ogv delete mode 100644 toolkit/components/windowcreator/test/320x240.webm create mode 100644 toolkit/content/tests/widgets/seek_with_sound.ogg delete mode 100644 toolkit/content/tests/widgets/seek_with_sound.webm create mode 100644 toolkit/content/tests/widgets/video.ogg delete mode 100644 toolkit/content/tests/widgets/video.webm diff --git a/.prettierignore b/.prettierignore index 206f3bd6ce82..dbfc022d782c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -911,6 +911,7 @@ mobile/android/geckoview/src/androidTest/assets/www/autoplay.html mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html mobile/android/geckoview/src/androidTest/assets/www/context_menu_video.html mobile/android/geckoview/src/androidTest/assets/www/mp4.html +mobile/android/geckoview/src/androidTest/assets/www/ogg.html mobile/android/geckoview/src/androidTest/assets/www/webm.html netwerk/test/browser/103_preload_iframe.html netwerk/test/browser/post.html diff --git a/browser/base/content/test/contextMenu/browser.toml b/browser/base/content/test/contextMenu/browser.toml index 660f6a955b7d..ccaefa3cfdc4 100644 --- a/browser/base/content/test/contextMenu/browser.toml +++ b/browser/base/content/test/contextMenu/browser.toml @@ -8,6 +8,7 @@ support-files = [ "subtst_contextmenu_xul.xhtml", "ctxmenu-image.png", "../general/head.js", + "../general/video.ogg", "../general/audio.ogg", "../../../../../toolkit/components/pdfjs/test/file_pdfjs_test.pdf", "contextmenu_common.js", @@ -18,7 +19,6 @@ support-files = [ ["browser_bug1798178.js"] ["browser_contextmenu.js"] -support-files = [ "../general/video.webm" ] tags = "fullscreen" skip-if = [ "os == 'linux'", diff --git a/browser/base/content/test/contextMenu/browser_contextmenu.js b/browser/base/content/test/contextMenu/browser_contextmenu.js index 00da3113c643..ebeb4bdb0449 100644 --- a/browser/base/content/test/contextMenu/browser_contextmenu.js +++ b/browser/base/content/test/contextMenu/browser_contextmenu.js @@ -137,7 +137,7 @@ add_task(async function test_setup_html() { audio.loop = true; audio.src = "audio.ogg"; video.loop = true; - video.src = "video.webm"; + video.src = "video.ogg"; let awaitPause = ContentTaskUtils.waitForEvent(audio, "pause"); await ContentTaskUtils.waitForCondition( diff --git a/browser/base/content/test/contextMenu/subtst_contextmenu.html b/browser/base/content/test/contextMenu/subtst_contextmenu.html index 2facd9fecce8..2c263fbce496 100644 --- a/browser/base/content/test/contextMenu/subtst_contextmenu.html +++ b/browser/base/content/test/contextMenu/subtst_contextmenu.html @@ -26,14 +26,14 @@ document.getElementById("shadow-host-in-link").attachShadow({ mode: "closed" }). - + - + diff --git a/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html b/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html index be45c2ddd08d..ac3b5415ddaf 100644 --- a/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html +++ b/browser/base/content/test/contextMenu/subtst_contextmenu_webext.html @@ -7,6 +7,6 @@ Browser context menu subtest. Link to an extension resource - + diff --git a/browser/base/content/test/general/browser.toml b/browser/base/content/test/general/browser.toml index 31d519d550a5..6928ba2d4ba0 100644 --- a/browser/base/content/test/general/browser.toml +++ b/browser/base/content/test/general/browser.toml @@ -37,6 +37,10 @@ support-files = [ "title_test.svg", "unknownContentType_file.pif", "unknownContentType_file.pif^headers^", + "video.ogg", + "web_video.html", + "web_video1.ogv", + "web_video1.ogv^headers^", "!/image/test/mochitest/blue.png", "!/toolkit/content/tests/browser/common/mockTransfer.js", ] @@ -207,7 +211,6 @@ support-files = [ "dummy.ics", "dummy.ics^headers^", "redirect_download.sjs", - "video.webm", ] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. @@ -432,19 +435,9 @@ skip-if = [ "os == 'win' && debug", "os =='linux'", #Bug 1212419 ] -support-files = [ - "web_video.html", - "web_video1.webm", - "web_video1.webm^headers^", -] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. ["browser_save_video_frame.js"] -support-files = [ - "web_video.html", - "web_video1.webm", - "web_video1.webm^headers^", -] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. ["browser_selectTabAtIndex.js"] diff --git a/browser/base/content/test/general/browser_bug676619.js b/browser/base/content/test/general/browser_bug676619.js index 90dd8f4f7c72..1381d64ea7f2 100644 --- a/browser/base/content/test/general/browser_bug676619.js +++ b/browser/base/content/test/general/browser_bug676619.js @@ -116,8 +116,8 @@ async function runTest(url) { await BrowserTestUtils.browserLoaded(browser); await testLink("link1", "test.txt"); - await testLink("link2", "video.webm"); - await testLink("link3", "just some video.webm"); + await testLink("link2", "video.ogg"); + await testLink("link3", "just some video.ogg"); await testLink("link4", "with-target.txt"); await testLink("link5", "javascript.html"); await testLink("link6", "test.blob"); @@ -132,8 +132,8 @@ async function runTest(url) { // Check that we enforce the correct extension if the website's // is bogus or missing. These extensions can differ slightly (ogx vs ogg, // htm vs html) on different OSes. - let webmExtension = getMIMEInfoForType("video/webm").primaryExtension; - await testLink("link13", "no file extension." + webmExtension); + let oggExtension = getMIMEInfoForType("application/ogg").primaryExtension; + await testLink("link13", "no file extension." + oggExtension); // See https://bugzilla.mozilla.org/show_bug.cgi?id=1690051#c8 if (AppConstants.platform != "win") { diff --git a/browser/base/content/test/general/browser_save_video.js b/browser/base/content/test/general/browser_save_video.js index dad14aa289de..e9701d702307 100644 --- a/browser/base/content/test/general/browser_save_video.js +++ b/browser/base/content/test/general/browser_save_video.js @@ -52,7 +52,7 @@ add_task(async function () { is( fileName, - "web-video1-expectedName.webm", + "web-video1-expectedName.ogv", "Video file name is correctly retrieved from Content-Disposition http header" ); resolve(); diff --git a/browser/base/content/test/general/download_page.html b/browser/base/content/test/general/download_page.html index 625ff46aab1c..dc86806b8573 100644 --- a/browser/base/content/test/general/download_page.html +++ b/browser/base/content/test/general/download_page.html @@ -13,10 +13,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=676619