Skip to content

Commit 6e795c4

Browse files
Guohui Dengchromium-wpt-export-bot
authored andcommitted
Enable InitiatorUrl for ResourceTiming on static resources from CSS files
Bug: 40919714 Change-Id: I5822ce4abf58b5304acbb7e1b8d43fb5aef561d0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/8066304 Reviewed-by: Noam Rosenthal <nrosenthal@google.com> Reviewed-by: Scott Haseley <shaseley@chromium.org> Commit-Queue: Guohui Deng <guohuideng@microsoft.com> Cr-Commit-Position: refs/heads/main@{#1664854}
1 parent 69eb567 commit 6e795c4

5 files changed

Lines changed: 98 additions & 23 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@import "resource_timing_test0.css?label=dynamic-initiator";
2+
3+
@font-face {
4+
font-family: remoteFont;
5+
src: url('/fonts/Ahem.ttf?label=dynamic-initiator');
6+
}
7+
ol {
8+
font-family: remoteFont;
9+
list-style-image: url('blue.png?label=dynamic-initiator');
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@import "resource_timing_test0.css?label=initiator";
2+
3+
@font-face {
4+
font-family: remoteFont;
5+
src: url('/fonts/Ahem.ttf?label=initiator');
6+
}
7+
ol {
8+
font-family: remoteFont;
9+
list-style-image: url('blue.png?label=initiator');
10+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Resource Timing - initiatorUrl for resources loaded by a dynamically inserted stylesheet</title>
6+
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
7+
<script src="/resources/testharness.js"></script>
8+
<script src="/resources/testharnessreport.js"></script>
9+
<script src="/common/get-host-info.sub.js"></script>
10+
<script src="../../resources/test-initiator.js"></script>
11+
</head>
12+
<body>
13+
<ol>
14+
<li>X</li>
15+
</ol>
16+
<script>
17+
const link = document.createElement("link");
18+
link.rel = "stylesheet";
19+
link.href = "/resource-timing/resources/nested-dynamic-initiator.css";
20+
document.head.appendChild(link);
21+
22+
const hostInfo = get_host_info();
23+
const documentInitiatorUrl = hostInfo["ORIGIN"] +
24+
"/resource-timing/tentative/initiator-url/stylesheet-dynamic.html";
25+
const stylesheetInitiatorUrl = hostInfo["ORIGIN"] +
26+
"/resource-timing/resources/nested-dynamic-initiator.css";
27+
28+
// The dynamically inserted stylesheet is initiated by this document.
29+
initiator_url_test("nested-dynamic-initiator.css", documentInitiatorUrl,
30+
"nested-dynamic-initiator.css initiatorUrl from document",
31+
"nested-dynamic-initiator.css timeout");
32+
33+
// The resources imported by the stylesheet are initiated by the stylesheet.
34+
const resources = [
35+
"resource_timing_test0.css?label=dynamic-initiator",
36+
"Ahem.ttf?label=dynamic-initiator",
37+
"blue.png?label=dynamic-initiator",
38+
];
39+
for (const resource of resources) {
40+
initiator_url_test(resource, stylesheetInitiatorUrl, resource +
41+
" initiatorUrl from style sheet", resource + " timeout");
42+
}
43+
</script>
44+
</body>
45+
</html>
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Resource Timing - initiatorUrl for resources loaded by a static stylesheet</title>
6+
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
7+
<script src="/resources/testharness.js"></script>
8+
<script src="/resources/testharnessreport.js"></script>
9+
<script src="/common/get-host-info.sub.js"></script>
10+
<script src="../../resources/test-initiator.js"></script>
11+
<link rel="stylesheet" href="/resource-timing/resources/nested-initiator.css">
12+
</head>
13+
<body>
14+
<ol>
15+
<li>X</li>
16+
</ol>
17+
<script>
18+
const hostInfo = get_host_info();
19+
const expectedInitiatorUrl = hostInfo["ORIGIN"] +
20+
"/resource-timing/resources/nested-initiator.css";
21+
22+
const resources = [
23+
"resource_timing_test0.css?label=initiator",
24+
"Ahem.ttf?label=initiator",
25+
"blue.png?label=initiator",
26+
];
27+
for (const resource of resources) {
28+
initiator_url_test(resource, expectedInitiatorUrl, resource +
29+
" initiatorUrl from style sheet", resource + " timeout");
30+
}
31+
</script>
32+
</body>
33+
</html>

resource-timing/tentative/stylesheet-initiated.html

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)