aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-05-17 18:10:09 -0400
committerGitHub <noreply@github.com>2019-05-17 18:10:09 -0400
commit208d6cb99e903942a77160f51c5483fd2edd40a1 (patch)
tree6f862031df7c12927d8da807aa673f70829c3851
parentcdd95caa8dc46c3e5868c83dee090e12e9d2ed62 (diff)
parent4ca4ab8bf7fce9bce3d137dddda288ee51f1d282 (diff)
downloadservo-208d6cb99e903942a77160f51c5483fd2edd40a1.tar.gz
servo-208d6cb99e903942a77160f51c5483fd2edd40a1.zip
Auto merge of #23323 - nehalem501:master, r=jdm
Implement connectStart in PerformanceResourceTiming <!-- Please describe your changes on the following line: --> - Added connectStart where needed (```ResourceFetchTiming```, ```ResourceAttribute```) in ```components/net_traits/lib.rs ``` - Before calling ```client.request``` in ```obtain_response```, we now add the ```connectStart``` attribute (```components/net/http_loader.rs```) - Updated tests to reflect those changes --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [X] These changes fix #21261 (at least partially) <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23323) <!-- Reviewable:end -->
-rw-r--r--components/net/http_loader.rs6
-rw-r--r--components/net_traits/lib.rs5
-rw-r--r--components/script/dom/performanceresourcetiming.rs7
-rw-r--r--components/script/dom/webidls/PerformanceResourceTiming.webidl2
-rw-r--r--tests/wpt/metadata/resource-timing/idlharness.any.js.ini9
-rw-r--r--tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini3
6 files changed, 17 insertions, 15 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 3f9f9f46f0a..6574623232d 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -381,6 +381,12 @@ fn obtain_response(
// TODO(#21261) connect_start: set if a persistent connection is *not* used and the last non-redirected
// fetch passes the timing allow check
let connect_start = precise_time_ms();
+ context
+ .timing
+ .lock()
+ .unwrap()
+ .set_attribute(ResourceAttribute::ConnectStart(connect_start));
+
// https://url.spec.whatwg.org/#percent-encoded-bytes
let request = HyperRequest::builder()
.method(method)
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
index 59d997df71d..853692da33c 100644
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@@ -452,7 +452,7 @@ pub struct ResourceFetchTiming {
pub response_end: u64,
pub redirect_start: u64,
// pub redirect_end: u64,
- // pub connect_start: u64,
+ pub connect_start: u64,
pub connect_end: u64,
}
@@ -468,6 +468,7 @@ pub enum ResourceAttribute {
ResponseStart,
RedirectStart(RedirectStartValue),
FetchStart,
+ ConnectStart(u64),
ConnectEnd(u64),
ResponseEnd,
}
@@ -489,6 +490,7 @@ impl ResourceFetchTiming {
response_start: 0,
fetch_start: 0,
redirect_start: 0,
+ connect_start: 0,
connect_end: 0,
response_end: 0,
}
@@ -510,6 +512,7 @@ impl ResourceFetchTiming {
},
},
ResourceAttribute::FetchStart => self.fetch_start = precise_time_ns(),
+ ResourceAttribute::ConnectStart(val) => self.connect_start = val,
ResourceAttribute::ConnectEnd(val) => self.connect_end = val,
ResourceAttribute::ResponseEnd => self.response_end = precise_time_ns(),
}
diff --git a/components/script/dom/performanceresourcetiming.rs b/components/script/dom/performanceresourcetiming.rs
index 9726f2c04e4..0c7df4d4f80 100644
--- a/components/script/dom/performanceresourcetiming.rs
+++ b/components/script/dom/performanceresourcetiming.rs
@@ -120,7 +120,7 @@ impl PerformanceResourceTiming {
fetch_start: resource_timing.fetch_start as f64,
domain_lookup_start: 0.,
domain_lookup_end: 0.,
- connect_start: 0.,
+ connect_start: resource_timing.connect_start as f64,
connect_end: resource_timing.connect_end as f64,
secure_connection_start: 0.,
request_start: resource_timing.request_start as f64,
@@ -192,6 +192,11 @@ impl PerformanceResourceTimingMethods for PerformanceResourceTiming {
Finite::wrap(self.fetch_start)
}
+ // https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-connectstart
+ fn ConnectStart(&self) -> DOMHighResTimeStamp {
+ Finite::wrap(self.connect_start)
+ }
+
// https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-connectend
fn ConnectEnd(&self) -> DOMHighResTimeStamp {
Finite::wrap(self.connect_end)
diff --git a/components/script/dom/webidls/PerformanceResourceTiming.webidl b/components/script/dom/webidls/PerformanceResourceTiming.webidl
index 9fdd9c845da..1c9cf1bb8e5 100644
--- a/components/script/dom/webidls/PerformanceResourceTiming.webidl
+++ b/components/script/dom/webidls/PerformanceResourceTiming.webidl
@@ -17,7 +17,7 @@ interface PerformanceResourceTiming : PerformanceEntry {
readonly attribute DOMHighResTimeStamp fetchStart;
// readonly attribute DOMHighResTimeStamp domainLookupStart;
// readonly attribute DOMHighResTimeStamp domainLookupEnd;
- // readonly attribute DOMHighResTimeStamp connectStart;
+ readonly attribute DOMHighResTimeStamp connectStart;
readonly attribute DOMHighResTimeStamp connectEnd;
// readonly attribute DOMHighResTimeStamp secureConnectionStart;
readonly attribute DOMHighResTimeStamp requestStart;
diff --git a/tests/wpt/metadata/resource-timing/idlharness.any.js.ini b/tests/wpt/metadata/resource-timing/idlharness.any.js.ini
index d5afd6d78d9..1938b2ca3ff 100644
--- a/tests/wpt/metadata/resource-timing/idlharness.any.js.ini
+++ b/tests/wpt/metadata/resource-timing/idlharness.any.js.ini
@@ -44,18 +44,12 @@
[PerformanceResourceTiming interface: resource must inherit property "domainLookupStart" with the proper type]
expected: FAIL
- [PerformanceResourceTiming interface: resource must inherit property "connectStart" with the proper type]
- expected: FAIL
-
[PerformanceResourceTiming interface: attribute workerStart]
expected: FAIL
[PerformanceResourceTiming interface: attribute domainLookupStart]
expected: FAIL
- [PerformanceResourceTiming interface: attribute connectStart]
- expected: FAIL
-
[PerformanceResourceTiming interface: resource must inherit property "redirectEnd" with the proper type]
expected: FAIL
@@ -157,9 +151,6 @@
[PerformanceResourceTiming interface: attribute domainLookupStart]
expected: FAIL
- [PerformanceResourceTiming interface: attribute connectStart]
- expected: FAIL
-
[PerformanceResourceTiming interface: attribute redirectEnd]
expected: FAIL
diff --git a/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini b/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini
index fe102191c74..191e465e85c 100644
--- a/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini
+++ b/tests/wpt/metadata/resource-timing/resource_TAO_zero.htm.ini
@@ -11,9 +11,6 @@
[domainLookupStart should be 0 in cross-origin request.]
expected: FAIL
- [connectStart should be 0 in cross-origin request.]
- expected: FAIL
-
[redirectStart should be 0 in cross-origin request.]
expected: PASS