diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-03-06 18:57:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-06 18:57:35 -0500 |
| commit | 008368fa671e2a25ea5dd81116e71ca21067e04b (patch) | |
| tree | ec3985248a10a6d8befdc537d3abe3340cd216d9 | |
| parent | 55347aa39f272b5b3fc7ede6403f70aa49d31ce1 (diff) | |
| parent | 086d2f4c2647994d2f5131a700e4a71354352736 (diff) | |
| download | servo-008368fa671e2a25ea5dd81116e71ca21067e04b.tar.gz servo-008368fa671e2a25ea5dd81116e71ca21067e04b.zip | |
Auto merge of #22808 - servo:jdm-patch-10, r=asajeffrey
Avoid locking network timing data unnecessarily.
<!-- 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/22808)
<!-- Reviewable:end -->
| -rw-r--r-- | components/net/http_loader.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index dba4b2d3127..364648550c3 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -618,8 +618,7 @@ pub fn http_fetch( request.redirect_count as u16, )); - let timing = &*context.timing.lock().unwrap(); - response.resource_timing = timing.clone(); + response.resource_timing = context.timing.lock().unwrap().clone(); // Step 6 response @@ -1207,8 +1206,8 @@ fn http_network_fetch( } } - let timing = &*context.timing.lock().unwrap(); - let mut response = Response::new(url.clone(), timing.clone()); + let timing = context.timing.lock().unwrap().clone(); + let mut response = Response::new(url.clone(), timing); response.status = Some(( res.status(), res.status().canonical_reason().unwrap_or("").into(), |