diff options
author | Ravi Shankar <wafflespeanut@gmail.com> | 2015-11-07 18:48:37 +0530 |
---|---|---|
committer | Ravi Shankar <wafflespeanut@gmail.com> | 2015-11-12 14:02:59 +0530 |
commit | 10f5584f78faac769f5b6807eaf683b79554a27f (patch) | |
tree | b17e947ba5bd5b79709ffba7c9cd7d77c0c66110 /components/net/about_loader.rs | |
parent | 92f9e58310f1b7c3925882979ae9352967866b66 (diff) | |
download | servo-10f5584f78faac769f5b6807eaf683b79554a27f.tar.gz servo-10f5584f78faac769f5b6807eaf683b79554a27f.zip |
Implement cancellation listener for cancelling network requests
Diffstat (limited to 'components/net/about_loader.rs')
-rw-r--r-- | components/net/about_loader.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/components/net/about_loader.rs b/components/net/about_loader.rs index 04878fed70b..6a03aeb041d 100644 --- a/components/net/about_loader.rs +++ b/components/net/about_loader.rs @@ -9,13 +9,16 @@ use hyper::mime::{Mime, SubLevel, TopLevel}; use mime_classifier::MIMEClassifier; use net_traits::ProgressMsg::Done; use net_traits::{LoadConsumer, LoadData, Metadata}; -use resource_task::{send_error, start_sending_sniffed_opt}; +use resource_task::{CancellationListener, send_error, start_sending_sniffed_opt}; use std::fs::PathExt; use std::sync::Arc; use url::Url; use util::resource_files::resources_dir_path; -pub fn factory(mut load_data: LoadData, start_chan: LoadConsumer, classifier: Arc<MIMEClassifier>) { +pub fn factory(mut load_data: LoadData, + start_chan: LoadConsumer, + classifier: Arc<MIMEClassifier>, + cancel_listener: CancellationListener) { match load_data.url.non_relative_scheme_data().unwrap() { "blank" => { let metadata = Metadata { @@ -42,5 +45,5 @@ pub fn factory(mut load_data: LoadData, start_chan: LoadConsumer, classifier: Ar return } }; - file_loader::factory(load_data, start_chan, classifier) + file_loader::factory(load_data, start_chan, classifier, cancel_listener) } |