From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../table-cell-vertical-align-001-print-ref.html | 41 ++++++++++++++ .../table/table-cell-vertical-align-001-print.html | 46 ++++++++++++++++ .../table-cell-vertical-align-002-print-ref.html | 41 ++++++++++++++ .../table/table-cell-vertical-align-002-print.html | 59 +++++++++++++++++++++ .../tests/css/cssom/window_size_rounding.html | 58 +++++++++++--------- .../web-platform/mozilla/tests/media/2x2-green.ogv | Bin 7660 -> 0 bytes .../mozilla/tests/media/2x2-green.webm | Bin 0 -> 794 bytes .../tests/service-workers/resources/fetch_video.py | 4 +- .../webdriver/harness/preferences_remote_agent.py | 2 +- .../mozilla/tests/webgpu/resources/README.md | 3 +- .../webgpu/resources/four-colors-theora-bt601.ogv | Bin 44488 -> 0 bytes .../tests/webgpu/webgpu/web_platform/util.js | 10 +--- 12 files changed, 224 insertions(+), 40 deletions(-) create mode 100644 testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print-ref.html create mode 100644 testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print.html create mode 100644 testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print-ref.html create mode 100644 testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print.html delete mode 100644 testing/web-platform/mozilla/tests/media/2x2-green.ogv create mode 100644 testing/web-platform/mozilla/tests/media/2x2-green.webm delete mode 100644 testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv (limited to 'testing/web-platform/mozilla/tests') diff --git a/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print-ref.html b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print-ref.html new file mode 100644 index 0000000000..c3acd7e90a --- /dev/null +++ b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print-ref.html @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + +
+
    +
  4. +
  8. +
  12. +
+ 		topmiddlebottombottom
+
    +
  2. +
  4. +
+
diff --git a/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print.html b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print.html new file mode 100644 index 0000000000..a5812ce42e --- /dev/null +++ b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-001-print.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + +
+
    +
  4. +
  8. +
  12. +
+ 		topmiddlebottombottom
+
    +
  2. +
  4. +
+
diff --git a/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print-ref.html b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print-ref.html new file mode 100644 index 0000000000..f525414684 --- /dev/null +++ b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print-ref.html @@ -0,0 +1,41 @@ + + + + + + + + + +
+
    +
  4. +
+
bottom
+
+ +
+
    +
  4. +
  8. +
  12. +
+
bottom
+
diff --git a/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print.html b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print.html new file mode 100644 index 0000000000..91416ee543 --- /dev/null +++ b/testing/web-platform/mozilla/tests/css/css-break/table/table-cell-vertical-align-002-print.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+
    +
  4. +
+ 		bottom
+
    +
  4. +
  8. +
  12. +
+ 		bottom
diff --git a/testing/web-platform/mozilla/tests/css/cssom/window_size_rounding.html b/testing/web-platform/mozilla/tests/css/cssom/window_size_rounding.html index 695bf8f34b..c49f7cbae8 100644 --- a/testing/web-platform/mozilla/tests/css/cssom/window_size_rounding.html +++ b/testing/web-platform/mozilla/tests/css/cssom/window_size_rounding.html @@ -1,35 +1,41 @@ + -
+
 
diff --git a/testing/web-platform/mozilla/tests/media/2x2-green.ogv b/testing/web-platform/mozilla/tests/media/2x2-green.ogv
deleted file mode 100644
index 29903c0a81..0000000000
Binary files a/testing/web-platform/mozilla/tests/media/2x2-green.ogv and /dev/null differ
diff --git a/testing/web-platform/mozilla/tests/media/2x2-green.webm b/testing/web-platform/mozilla/tests/media/2x2-green.webm
new file mode 100644
index 0000000000..71ddce9099
Binary files /dev/null and b/testing/web-platform/mozilla/tests/media/2x2-green.webm differ
diff --git a/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py b/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py
index 3945506f30..0d2967b731 100644
--- a/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py
+++ b/testing/web-platform/mozilla/tests/service-workers/resources/fetch_video.py
@@ -2,11 +2,11 @@ import os
 
 
 def main(request, response):
-    filename = os.path.join(request.doc_root, "media", "2x2-green.ogv")
+    filename = os.path.join(request.doc_root, "media", "2x2-green.webm")
     body = open(filename, "rb").read()
     length = len(body)
     headers = [
-        (b"Content-Type", b"video/ogg"),
+        (b"Content-Type", b"video/webm"),
         (b"Accept-Ranges", b"bytes"),
         (b"Content-Length", b"%d" % length),
         (b"Content-Range", b"bytes 0-%d/%d" % (length - 1, length)),
diff --git a/testing/web-platform/mozilla/tests/webdriver/harness/preferences_remote_agent.py b/testing/web-platform/mozilla/tests/webdriver/harness/preferences_remote_agent.py
index 59db5fa0e3..89d8134d42 100644
--- a/testing/web-platform/mozilla/tests/webdriver/harness/preferences_remote_agent.py
+++ b/testing/web-platform/mozilla/tests/webdriver/harness/preferences_remote_agent.py
@@ -31,7 +31,7 @@ def test_remote_agent_recommended_preferences_applied(browser, value):
     wait = Poll(
         None,
         timeout=5,
-        ignored_exceptions=FileNotFoundError,
+        ignored_exceptions=IOError,
         message="""Preference "remote.prefs.recommended.applied" is not true""",
     )
     wait.until(pref_is_set)
diff --git a/testing/web-platform/mozilla/tests/webgpu/resources/README.md b/testing/web-platform/mozilla/tests/webgpu/resources/README.md
index 824f82b998..28f23f288b 100644
--- a/testing/web-platform/mozilla/tests/webgpu/resources/README.md
+++ b/testing/web-platform/mozilla/tests/webgpu/resources/README.md
@@ -4,7 +4,6 @@ on the context (WPT, standalone, worker, etc.)
 
 The test video files were generated with the ffmpeg cmds below:
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-vp8-bt601.webm
-ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libtheora -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-theora-bt601.ogv
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libx264 -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-h264-bt601.mp4
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx-vp9 -pix_fmt yuv420p -frames 500 -colorspace smpte170m -color_primaries smpte170m -color_trc smpte170m -color_range tv four-colors-vp9-bt601.webm
 ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx-vp9 -pix_fmt yuv420p -frames 500 -colorspace bt709 -color_primaries bt709 -color_trc bt709 -color_range tv -vf scale=out_color_matrix=bt709:out_range=tv four-colors-vp9-bt709.webm
@@ -12,4 +11,4 @@ ffmpeg.exe -loop 1 -i .\four-colors.png -c:v libvpx-vp9 -pix_fmt yuv420p -frames
 These rotation test files are copies of four-colors-h264-bt601.mp4 with metadata changes.
 ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=90 four-colors-h264-bt601-rotate-90.mp4
 ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=180 four-colors-h264-bt601-rotate-180.mp4
-ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=270 four-colors-h264-bt601-rotate-270.mp4
\ No newline at end of file
+ffmpeg.exe -i .\four-colors-h264-bt601.mp4 -c copy -metadata:s:v rotate=270 four-colors-h264-bt601-rotate-270.mp4
diff --git a/testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv b/testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv
deleted file mode 100644
index 79ed41163c..0000000000
Binary files a/testing/web-platform/mozilla/tests/webgpu/resources/four-colors-theora-bt601.ogv and /dev/null differ
diff --git a/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js b/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js
index f34723510c..df4b02447f 100644
--- a/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js
+++ b/testing/web-platform/mozilla/tests/webgpu/webgpu/web_platform/util.js
@@ -19,7 +19,6 @@ makeTable(
   [undefined], {
     // All video names
     'four-colors-vp8-bt601.webm': ['video/webm; codecs=vp8'],
-    'four-colors-theora-bt601.ogv': ['video/ogg; codecs=theora'],
     'four-colors-h264-bt601.mp4': ['video/mp4; codecs=avc1.4d400c'],
     'four-colors-vp9-bt601.webm': ['video/webm; codecs=vp9'],
     'four-colors-vp9-bt709.webm': ['video/webm; codecs=vp9'],
@@ -66,13 +65,6 @@ export const kVideoExpectations = [
   _blueExpectation: kBt601Blue,
   _yellowExpectation: kBt601Yellow
 },
-{
-  videoName: 'four-colors-theora-bt601.ogv',
-  _redExpectation: kBt601Red,
-  _greenExpectation: kBt601Green,
-  _blueExpectation: kBt601Blue,
-  _yellowExpectation: kBt601Yellow
-},
 {
   videoName: 'four-colors-h264-bt601.mp4',
   _redExpectation: kBt601Red,
@@ -304,4 +296,4 @@ timeoutMessage)
   });
   const promise = raceWithRejectOnTimeout(promiseWithoutTimeout, 2000, timeoutMessage);
   return { promise, callbackAndResolve: callbackAndResolve };
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3