diff --git a/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-cross-origin-child.sub.html b/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-cross-origin-child.sub.html
index 4be0df872cbfd..a49174519e42d 100644
--- a/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-cross-origin-child.sub.html
+++ b/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-cross-origin-child.sub.html
@@ -8,9 +8,11 @@
document.body.appendChild(childFrame)
performance.mark("entry-name")
+ const loadPromise = new Promise(resolve => window.addEventListener("load", resolve))
- childFrame.addEventListener('load', () => {
+ childFrame.addEventListener('load', async () => {
+ await loadPromise
const entries = performance.getEntries(true)
window.parent.postMessage(entries.length, "*")
})
-
\ No newline at end of file
+
diff --git a/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-same-origin-child.html b/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-same-origin-child.html
index c9248a4e8bb9f..813c2a725bdd5 100644
--- a/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-same-origin-child.html
+++ b/testing/web-platform/tests/performance-timeline/resources/parent-frame-with-same-origin-child.html
@@ -8,9 +8,11 @@
document.body.appendChild(childFrame)
performance.mark("entry-name")
+ const loadPromise = new Promise(resolve => window.addEventListener("load", resolve));
- childFrame.addEventListener('load', () => {
+ childFrame.addEventListener('load', async () => {
+ await loadPromise;
const entries = performance.getEntries(true)
window.parent.postMessage(entries.length, "*")
})
-
\ No newline at end of file
+
diff --git a/testing/web-platform/tests/resource-timing/iframe-sequence-of-events.html b/testing/web-platform/tests/resource-timing/iframe-sequence-of-events.html
index 5f99a5cab2de6..02d1c362c9df4 100644
--- a/testing/web-platform/tests/resource-timing/iframe-sequence-of-events.html
+++ b/testing/web-platform/tests/resource-timing/iframe-sequence-of-events.html
@@ -4,9 +4,21 @@
+
+
-
\ No newline at end of file
+
+
+
diff --git a/testing/web-platform/tests/resource-timing/resources/delay-load.html b/testing/web-platform/tests/resource-timing/resources/delay-load.html
new file mode 100644
index 0000000000000..4898c1be8ebff
--- /dev/null
+++ b/testing/web-platform/tests/resource-timing/resources/delay-load.html
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/testing/web-platform/tests/resource-timing/resources/frame-timing.js b/testing/web-platform/tests/resource-timing/resources/frame-timing.js
index e0c364e9b2c3e..019bd424b5506 100644
--- a/testing/web-platform/tests/resource-timing/resources/frame-timing.js
+++ b/testing/web-platform/tests/resource-timing/resources/frame-timing.js
@@ -1,48 +1,63 @@
function test_frame_timing_before_load_event(type) {
- promise_test(async t => {
- const {document, performance} = type === 'frame' ? window.parent : window;
- const delay = 500;
- const frame = document.createElement(type);
- t.add_cleanup(() => frame.remove());
- await new Promise(resolve => {
- frame.addEventListener('load', resolve);
- frame.src = `resources/iframe-with-delay.sub.html?delay=${delay}`;
- (type === 'frame' ? document.querySelector('frameset') : document.body).appendChild(frame);
- });
+ promise_test(async t => {
+ const {document, performance} = type === 'frame' ? window.parent : window;
+ const delay = 500;
+ const frame = document.createElement(type);
+ t.add_cleanup(() => frame.remove());
+ await new Promise(resolve => {
+ frame.addEventListener('load', resolve);
+ frame.src = `/resource-timing/resources/iframe-with-delay.sub.html?delay=${delay}`;
+ (type === 'frame' ? document.querySelector('frameset') : document.body).appendChild(frame);
+ });
- const entries = performance.getEntriesByName(frame.src);
- const navigationEntry = frame.contentWindow.performance.getEntriesByType('navigation')[0];
- assert_equals(entries.length, 1);
- assert_equals(entries[0].initiatorType, type);
- assert_greater_than(performance.now(), entries[0].responseEnd + delay);
- const domContentLoadedEventAbsoluteTime = navigationEntry.domContentLoadedEventStart + frame.contentWindow.performance.timeOrigin;
- const frameResponseEndAbsoluteTime = entries[0].responseEnd + performance.timeOrigin;
- assert_greater_than(domContentLoadedEventAbsoluteTime, frameResponseEndAbsoluteTime);
- }, `A ${type} should report its RT entry when the response is done and before it is completely loaded`);
+ const entries = performance.getEntriesByName(frame.src);
+ const navigationEntry = frame.contentWindow.performance.getEntriesByType('navigation')[0];
+ assert_equals(entries.length, 1);
+ assert_equals(entries[0].initiatorType, type);
+ assert_greater_than(performance.now(), entries[0].responseEnd + delay);
+ const domContentLoadedEventAbsoluteTime =
+ navigationEntry.domContentLoadedEventStart +
+ frame.contentWindow.performance.timeOrigin;
+ const frameResponseEndAbsoluteTime = entries[0].responseEnd + performance.timeOrigin;
+ assert_greater_than(domContentLoadedEventAbsoluteTime, frameResponseEndAbsoluteTime);
+ }, `A ${type} should report its RT entry when the response is done and before it is completely loaded`);
}
-function test_frame_timing_change_src(type) {
- promise_test(async t => {
- const {document, performance} = type === 'frame' ? window.parent : window;
- const frame = document.createElement(type);
- t.add_cleanup(() => frame.remove());
- await new Promise(resolve => {
- const done = () => {
- resolve();
- frame.removeEventListener('load', done);
- }
- frame.addEventListener('load', done);
- frame.src = 'resources/green.html?1';
- (type === 'frame' ? document.querySelector('frameset') : document.body).appendChild(frame);
- });
+function test_frame_timing_change_src(type,
+ origin1 = document.origin,
+ origin2 = document.origin,
+ tao = false, label = '') {
+ const uid = token();
+ promise_test(async t => {
+ const {document, performance} = type === 'frame' ? window.parent : window;
+ const frame = document.createElement(type);
+ t.add_cleanup(() => frame.remove());
+ function createURL(origin) {
+ const url = new URL(`${origin}/resource-timing/resources/green.html`, location.href);
+ url.searchParams.set("uid", uid);
+ if (tao)
+ url.searchParams.set("pipe", "header(Timing-Allow-Origin, *)");
+ return url.toString();
+ }
- await new Promise(resolve => {
- frame.addEventListener('load', resolve);
- frame.src = 'resources/green.html?2';
- });
+ await new Promise(resolve => {
+ const done = () => {
+ resolve();
+ frame.removeEventListener('load', done);
+ }
+ frame.addEventListener('load', done);
+ frame.src = createURL(origin1);
+ const root = type === 'frame' ? document.querySelector('frameset') : document.body;
+ root.appendChild(frame);
+ });
- const entries = performance.getEntries().filter(e => e.name.includes('green.html'));
- assert_equals(entries.length, 2);
- }, `A ${type} should report separate RT entries if its src changed from the outside`);
-}
\ No newline at end of file
+ await new Promise(resolve => {
+ frame.addEventListener('load', resolve);
+ frame.src = createURL(origin2);
+ });
+
+ const entries = performance.getEntries().filter(e => e.name.includes(uid));
+ assert_equals(entries.length, 2);
+ }, label || `A ${type} should report separate RT entries if its src changed from the outside`);
+}