summaryrefslogtreecommitdiffstats
path: root/testing/web-platform/tests/resource-timing
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
commitd8bbc7858622b6d9c278469aab701ca0b609cddf (patch)
treeeff41dc61d9f714852212739e6b3738b82a2af87 /testing/web-platform/tests/resource-timing
parentReleasing progress-linux version 125.0.3-1~progress7.99u1. (diff)
downloadfirefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz
firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/tests/resource-timing')
-rw-r--r--testing/web-platform/tests/resource-timing/initiator-type/script.html2
-rw-r--r--testing/web-platform/tests/resource-timing/initiator-type/video.html4
-rw-r--r--testing/web-platform/tests/resource-timing/resources/child_script.js1
-rw-r--r--testing/web-platform/tests/resource-timing/resources/parent_script.js1
4 files changed, 6 insertions, 2 deletions
diff --git a/testing/web-platform/tests/resource-timing/initiator-type/script.html b/testing/web-platform/tests/resource-timing/initiator-type/script.html
index dbd6a131de..6e9e3ae7ee 100644
--- a/testing/web-platform/tests/resource-timing/initiator-type/script.html
+++ b/testing/web-platform/tests/resource-timing/initiator-type/script.html
@@ -12,6 +12,7 @@
</head>
<body>
<script src="/resource-timing/resources/empty_script.js"></script>
+<script type="module" src="/resource-timing/resources/parent_script.js"></script>
<script>
const async_xhr = new XMLHttpRequest;
async_xhr.open('GET', '/resource-timing/resources/blue.png?id=async_xhr',
@@ -21,6 +22,7 @@
<script>
initiator_type_test("empty_script.js", "script", "<script>");
initiator_type_test("blue.png?id=async_xhr", "xmlhttprequest", "an asynchronous XmlHTTPRequest");
+ initiator_type_test("child.js", "script", "script imported from another script");
</script>
</body>
</html>
diff --git a/testing/web-platform/tests/resource-timing/initiator-type/video.html b/testing/web-platform/tests/resource-timing/initiator-type/video.html
index 16f3b3dea5..2d8c9dcc47 100644
--- a/testing/web-platform/tests/resource-timing/initiator-type/video.html
+++ b/testing/web-platform/tests/resource-timing/initiator-type/video.html
@@ -19,14 +19,14 @@
src="/resource-timing/resources/empty.py?id=track">
</video>
<video autoplay="true">
- <source src="/media/test.ogv?id=source-ogv" type="video/ogg">
+ <source src="/media/test.webm?id=source-webm" type="video/webm">
</video>
<script>
initiator_type_test("blue.png?id=poster", "video", "<video poster>");
initiator_type_test("media/test.mp4?id=src", "video", "<video src>");
initiator_type_test("media/test.mp4?id=source-mp4", "video", "<source src> with type=\"video/mp4\"");
initiator_type_test("empty.py?id=track", "track", "<track src>");
- initiator_type_test("media/test.ogv?id=source-ogv", "video", "<source src> with type=\"video/ogg\"");
+ initiator_type_test("media/test.webm?id=source-webm", "video", "<source src> with type=\"video/webm\"");
</script>
</body>
</html>
diff --git a/testing/web-platform/tests/resource-timing/resources/child_script.js b/testing/web-platform/tests/resource-timing/resources/child_script.js
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/testing/web-platform/tests/resource-timing/resources/child_script.js
@@ -0,0 +1 @@
+
diff --git a/testing/web-platform/tests/resource-timing/resources/parent_script.js b/testing/web-platform/tests/resource-timing/resources/parent_script.js
new file mode 100644
index 0000000000..01ec0c5823
--- /dev/null
+++ b/testing/web-platform/tests/resource-timing/resources/parent_script.js
@@ -0,0 +1 @@
+import './child.js';