refactored performance timing to align with updated spec

refactoring with ResourceFetchMetadata

implemented deprecated window.timing functionality

created ResourceTimingListener trait

fixed w3c links in navigation timing

updated include.ini to run resource timing tests on ci

components/net/tests/fetch.rs

@@ -35,9 +35,9 @@ use net::hsts::HstsEntry;
 use net::test::HttpState;
 use net_traits::request::{Destination, Origin, RedirectMode, Referrer, Request, RequestMode};
 use net_traits::response::{CacheState, Response, ResponseBody, ResponseType};
-use net_traits::IncludeSubdomains;
-use net_traits::NetworkError;
-use net_traits::ReferrerPolicy;
+use net_traits::{
+    IncludeSubdomains, NetworkError, ReferrerPolicy, ResourceFetchTiming, ResourceTimingType,
+};
 use servo_url::{ImmutableOrigin, ServoUrl};
 use std::fs::File;
 use std::io::Read;
@@ -127,7 +127,7 @@ fn test_fetch_blob() {
     use ipc_channel::ipc;
     use net_traits::blob_url_store::BlobBuf;
 
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
 
     let bytes = b"content";
     let blob_buf = BlobBuf {
@@ -147,7 +147,7 @@ fn test_fetch_blob() {
     let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.to_simple())).unwrap();
 
     let mut request = Request::new(url, Some(Origin::Origin(origin.origin())), None);
-    let fetch_response = fetch_with_context(&mut request, &context);
+    let fetch_response = fetch_with_context(&mut request, &mut context);
 
     assert!(!fetch_response.is_network_error());
 
@@ -649,12 +649,15 @@ fn test_fetch_with_hsts() {
         .unwrap();
     let ssl_client = create_ssl_connector_builder(&ca_content);
 
-    let context = FetchContext {
+    let mut context = FetchContext {
         state: Arc::new(HttpState::new(ssl_client)),
         user_agent: DEFAULT_USER_AGENT.into(),
         devtools_chan: None,
         filemanager: FileManager::new(create_embedder_proxy()),
         cancellation_listener: Arc::new(Mutex::new(CancellationListener::new(None))),
+        timing: Arc::new(Mutex::new(ResourceFetchTiming::new(
+            ResourceTimingType::Navigation,
+        ))),
     };
 
     {
@@ -668,7 +671,7 @@ fn test_fetch_with_hsts() {
     request.referrer = Referrer::NoReferrer;
     // Set the flag.
     request.local_urls_only = false;
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
     server.close();
     assert_eq!(
         response.internal_response.unwrap().url().unwrap().scheme(),

components/net/tests/http_loader.rs

@@ -587,8 +587,8 @@ fn test_load_doesnt_add_host_to_sts_list_when_url_is_http_even_if_sts_headers_ar
         pipeline_id: Some(TEST_PIPELINE_ID),
         ..RequestInit::default()
     });
-    let context = new_fetch_context(None, None);
-    let response = fetch_with_context(&mut request, &context);
+    let mut context = new_fetch_context(None, None);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 
@@ -623,7 +623,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
     };
     let (server, url) = make_server(handler);
 
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
 
     assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
 
@@ -637,7 +637,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
         credentials_mode: CredentialsMode::Include,
         ..RequestInit::default()
     });
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 
@@ -669,7 +669,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
     };
     let (server, url) = make_server(handler);
 
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
 
     {
         let mut cookie_jar = context.state.cookie_jar.write().unwrap();
@@ -692,7 +692,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
         credentials_mode: CredentialsMode::Include,
         ..RequestInit::default()
     });
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 
@@ -718,7 +718,7 @@ fn test_load_sends_cookie_if_nonhttp() {
     };
     let (server, url) = make_server(handler);
 
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
 
     {
         let mut cookie_jar = context.state.cookie_jar.write().unwrap();
@@ -741,7 +741,7 @@ fn test_load_sends_cookie_if_nonhttp() {
         credentials_mode: CredentialsMode::Include,
         ..RequestInit::default()
     });
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 
@@ -767,7 +767,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
     };
     let (server, url) = make_server(handler);
 
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
 
     assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
 
@@ -781,7 +781,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
         credentials_mode: CredentialsMode::Include,
         ..RequestInit::default()
     });
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 
@@ -819,7 +819,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
     };
     let (server, url) = make_server(handler);
 
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
 
     assert_cookie_for_domain(&context.state.cookie_jar, url.as_str(), None);
 
@@ -833,7 +833,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
         credentials_mode: CredentialsMode::Include,
         ..RequestInit::default()
     });
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 
@@ -1242,7 +1242,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
     let url_y = ServoUrl::parse(&format!("http://mozilla.org:{}/org/", port)).unwrap();
     *shared_url_y_clone.lock().unwrap() = Some(url_y.clone());
 
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
     {
         let mut cookie_jar = context.state.cookie_jar.write().unwrap();
         let cookie_x = Cookie::new_wrapped(
@@ -1272,7 +1272,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
         credentials_mode: CredentialsMode::Include,
         ..RequestInit::default()
     });
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 
@@ -1355,7 +1355,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() {
         credentials_mode: CredentialsMode::Include,
         ..RequestInit::default()
     });
-    let context = new_fetch_context(None, None);
+    let mut context = new_fetch_context(None, None);
 
     let auth_entry = AuthCacheEntry {
         user_name: "username".to_owned(),
@@ -1370,7 +1370,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() {
         .entries
         .insert(url.origin().clone().ascii_serialization(), auth_entry);
 
-    let response = fetch_with_context(&mut request, &context);
+    let response = fetch_with_context(&mut request, &mut context);
 
     let _ = server.close();
 

components/net/tests/main.rs

@@ -35,7 +35,7 @@ use net::filemanager_thread::FileManager;
 use net::test::HttpState;
 use net_traits::request::Request;
 use net_traits::response::Response;
-use net_traits::FetchTaskTarget;
+use net_traits::{FetchTaskTarget, ResourceFetchTiming, ResourceTimingType};
 use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
 use servo_url::ServoUrl;
 use std::net::TcpListener as StdTcpListener;
@@ -93,6 +93,9 @@ fn new_fetch_context(
         devtools_chan: dc,
         filemanager: FileManager::new(sender),
         cancellation_listener: Arc::new(Mutex::new(CancellationListener::new(None))),
+        timing: Arc::new(Mutex::new(ResourceFetchTiming::new(
+            ResourceTimingType::Navigation,
+        ))),
     }
 }
 impl FetchTaskTarget for FetchResponseCollector {
@@ -107,14 +110,14 @@ impl FetchTaskTarget for FetchResponseCollector {
 }
 
 fn fetch(request: &mut Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
-    fetch_with_context(request, &new_fetch_context(dc, None))
+    fetch_with_context(request, &mut new_fetch_context(dc, None))
 }
 
-fn fetch_with_context(request: &mut Request, context: &FetchContext) -> Response {
+fn fetch_with_context(request: &mut Request, mut context: &mut FetchContext) -> Response {
     let (sender, receiver) = unbounded();
     let mut target = FetchResponseCollector { sender: sender };
 
-    methods::fetch(request, &mut target, context);
+    methods::fetch(request, &mut target, &mut context);
 
     receiver.recv().unwrap()
 }
@@ -123,7 +126,12 @@ fn fetch_with_cors_cache(request: &mut Request, cache: &mut CorsCache) -> Respon
     let (sender, receiver) = unbounded();
     let mut target = FetchResponseCollector { sender: sender };
 
-    methods::fetch_with_cors_cache(request, cache, &mut target, &new_fetch_context(None, None));
+    methods::fetch_with_cors_cache(
+        request,
+        cache,
+        &mut target,
+        &mut new_fetch_context(None, None),
+    );
 
     receiver.recv().unwrap()
 }

components/net/tests/subresource_integrity.rs

@@ -5,6 +5,7 @@
 use net::subresource_integrity::{get_prioritized_hash_function, get_strongest_metadata, SriEntry};
 use net::subresource_integrity::{is_response_integrity_valid, parsed_metadata};
 use net_traits::response::{Response, ResponseBody};
+use net_traits::{ResourceFetchTiming, ResourceTimingType};
 use servo_url::ServoUrl;
 
 #[test]
@@ -70,7 +71,10 @@ fn test_get_strongest_metadata_different_algorithm() {
 #[test]
 fn test_response_integrity_valid() {
     let url: ServoUrl = ServoUrl::parse("http://servo.org").unwrap();
-    let response: Response = Response::new(url);
+    let response: Response = Response::new(
+        url,
+        ResourceFetchTiming::new(ResourceTimingType::Navigation),
+    );
 
     let integrity_metadata =
         "sha384-H8BRh8j48O9oYatfu5AZzq6A9RINhZO5H16dQZngK7T62em8MUt1FLm52t+eX6xO";
@@ -83,7 +87,10 @@ fn test_response_integrity_valid() {
 #[test]
 fn test_response_integrity_invalid() {
     let url: ServoUrl = ServoUrl::parse("http://servo.org").unwrap();
-    let response: Response = Response::new(url);
+    let response: Response = Response::new(
+        url,
+        ResourceFetchTiming::new(ResourceTimingType::Navigation),
+    );
 
     let integrity_metadata =
         "sha256-H8BRh8j48O9oYatfu5AZzq6A9RINhZO5H16dQZngK7T62em8MUt1FLm52t+eX6xO";