diff options
author | Ms2ger <Ms2ger@gmail.com> | 2016-11-22 00:04:08 +0100 |
---|---|---|
committer | Ms2ger <Ms2ger@gmail.com> | 2016-11-24 11:46:26 +0100 |
commit | ffc2e09ea7d8588b5c43d67f8888114b760e22a5 (patch) | |
tree | 765d841ca695ad807f3551e82b0bf1e531782ae5 /components/net/fetch/methods.rs | |
parent | fb1279ec3a97c16b17ee9ae3add69152029a4bc0 (diff) | |
download | servo-ffc2e09ea7d8588b5c43d67f8888114b760e22a5.tar.gz servo-ffc2e09ea7d8588b5c43d67f8888114b760e22a5.zip |
Remove unused CancellationListener argument to obtain_response.
Diffstat (limited to 'components/net/fetch/methods.rs')
-rw-r--r-- | components/net/fetch/methods.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index f6a6c62f489..adff11d425b 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -28,7 +28,6 @@ use net_traits::request::{CacheMode, CredentialsMode, Destination}; use net_traits::request::{RedirectMode, Referrer, Request, RequestMode, ResponseTainting}; use net_traits::request::{Type, Origin, Window}; use net_traits::response::{HttpsState, Response, ResponseBody, ResponseType}; -use resource_thread::CancellationListener; use servo_url::ServoUrl; use std::borrow::Cow; use std::collections::HashSet; @@ -992,7 +991,6 @@ fn http_network_fetch(request: Rc<Request>, connector: connection, }; let url = request.current_url(); - let cancellation_listener = CancellationListener::new(None); let request_id = context.devtools_chan.as_ref().map(|_| { uuid::Uuid::new_v4().simple().to_string() @@ -1004,7 +1002,7 @@ fn http_network_fetch(request: Rc<Request>, let is_xhr = request.destination == Destination::None; let wrapped_response = obtain_response(&factory, &url, &request.method.borrow(), &request.headers.borrow(), - &cancellation_listener, &request.body.borrow(), &request.method.borrow(), + &request.body.borrow(), &request.method.borrow(), &request.pipeline_id.get(), request.redirect_count.get() + 1, request_id.as_ref().map(Deref::deref), is_xhr); @@ -1015,7 +1013,6 @@ fn http_network_fetch(request: Rc<Request>, let error = match error.error { LoadErrorType::ConnectionAborted { .. } => unreachable!(), LoadErrorType::Ssl { reason } => NetworkError::SslValidation(error.url, reason), - LoadErrorType::Cancelled => NetworkError::LoadCancelled, e => NetworkError::Internal(e.description().to_owned()) }; return Response::network_error(error); |