mirror of
https://github.com/servo/servo.git
synced 2025-08-09 15:35:34 +01:00
Use the asynchronous fetching code for fetch_with_context().
This commit is contained in:
parent
a5efc01b5f
commit
306905a631
1 changed files with 5 additions and 5 deletions
|
@ -72,20 +72,20 @@ impl FetchTaskTarget for FetchResponseCollector {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fetch(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
|
fn fetch(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
|
||||||
|
fetch_with_context(request, &new_fetch_context(dc))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fetch_with_context(request: Request, context: &FetchContext) -> Response {
|
||||||
let (sender, receiver) = channel();
|
let (sender, receiver) = channel();
|
||||||
let target = Box::new(FetchResponseCollector {
|
let target = Box::new(FetchResponseCollector {
|
||||||
sender: sender,
|
sender: sender,
|
||||||
});
|
});
|
||||||
|
|
||||||
methods::fetch(Rc::new(request), &mut Some(target), &new_fetch_context(dc));
|
methods::fetch(Rc::new(request), &mut Some(target), context);
|
||||||
|
|
||||||
receiver.recv().unwrap()
|
receiver.recv().unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fetch_with_context(request: Request, context: &FetchContext) -> Response {
|
|
||||||
methods::fetch(Rc::new(request), &mut None, context)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn make_server<H: Handler + 'static>(handler: H) -> (Listening, ServoUrl) {
|
fn make_server<H: Handler + 'static>(handler: H) -> (Listening, ServoUrl) {
|
||||||
// this is a Listening server because of handle_threads()
|
// this is a Listening server because of handle_threads()
|
||||||
let server = Server::http("0.0.0.0:0").unwrap().handle_threads(handler, 1).unwrap();
|
let server = Server::http("0.0.0.0:0").unwrap().handle_threads(handler, 1).unwrap();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue