aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/resource_thread.rs
diff options
context:
space:
mode:
authorddh <dianehosfelt@gmail.com>2016-07-14 20:29:32 +0100
committerddh <dianehosfelt@gmail.com>2016-07-29 11:20:38 +0100
commitdb808ca75d8645036b4e40d639e2b74b84caf4d2 (patch)
tree9b8dc122a30f1bf734b168107ff4c1b3b4d32350 /components/net/resource_thread.rs
parent45209b7ffea7b2355e227719ed29cb6aa6f00e0f (diff)
downloadservo-db808ca75d8645036b4e40d639e2b74b84caf4d2.tar.gz
servo-db808ca75d8645036b4e40d639e2b74b84caf4d2.zip
Added devtools support to fetch for XHR + Manish's XHR ident fix
added unit test for request fetch with devtools added devtools/fetch test
Diffstat (limited to 'components/net/resource_thread.rs')
-rw-r--r--components/net/resource_thread.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index e43451f0806..b24e1bbe7bf 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -574,7 +574,7 @@ impl CoreResourceManager {
return
}
};
- debug!("resource_thread: loading url: {}", load_data.url);
+ debug!("loading url: {}", load_data.url);
loader.call_box((load_data,
consumer,
@@ -593,6 +593,7 @@ impl CoreResourceManager {
blocked_content: BLOCKED_CONTENT_RULES.clone(),
};
let ua = self.user_agent.clone();
+ let dc = self.devtools_chan.clone();
spawn_named(format!("fetch thread for {}", init.url), move || {
let request = Request::from_init(init);
// XXXManishearth: Check origin against pipeline id (also ensure that the mode is allowed)
@@ -600,7 +601,7 @@ impl CoreResourceManager {
// todo referrer policy?
// todo service worker stuff
let mut target = Some(Box::new(sender) as Box<FetchTaskTarget + Send + 'static>);
- let context = FetchContext { state: http_state, user_agent: ua };
+ let context = FetchContext { state: http_state, user_agent: ua, devtools_chan: dc };
fetch(Rc::new(request), &mut target, context);
})
}