aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/data_loader.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2015-02-21 11:22:31 -0500
committerJosh Matthews <josh@joshmatthews.net>2015-04-06 20:19:30 -0400
commita3201bc1ac0c29e904c14fd19fffb323f1e28b40 (patch)
treec492d5796e2683bec3b3a0eaf89abccd55bd9fff /components/net/data_loader.rs
parent2d730f2ae947a369e6f82869dd4e6f3604b40709 (diff)
downloadservo-a3201bc1ac0c29e904c14fd19fffb323f1e28b40.tar.gz
servo-a3201bc1ac0c29e904c14fd19fffb323f1e28b40.zip
Enable optional mime sniffing, and integrate it with the file loader.
Diffstat (limited to 'components/net/data_loader.rs')
-rw-r--r--components/net/data_loader.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/components/net/data_loader.rs b/components/net/data_loader.rs
index e052abc8d07..7bd0a3bf887 100644
--- a/components/net/data_loader.rs
+++ b/components/net/data_loader.rs
@@ -4,22 +4,24 @@
use net_traits::{LoadData, Metadata};
use net_traits::ProgressMsg::{Payload, Done};
+use mime_classifier::MIMEClassifier;
use resource_task::start_sending;
use rustc_serialize::base64::FromBase64;
use hyper::mime::Mime;
+use std::sync::Arc;
use url::{percent_decode, SchemeData};
-pub fn factory(load_data: LoadData) {
+pub fn factory(load_data: LoadData, classifier: Arc<MIMEClassifier>) {
// NB: we don't spawn a new task.
// Hypothesis: data URLs are too small for parallel base64 etc. to be worth it.
// Should be tested at some point.
// Left in separate function to allow easy moving to a task, if desired.
- load(load_data)
+ load(load_data, classifier)
}
-fn load(load_data: LoadData) {
+fn load(load_data: LoadData, _classifier: Arc<MIMEClassifier>) {
let start_chan = load_data.consumer;
let url = load_data.url;
assert!(&*url.scheme == "data");