mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
net: Make most of the resource task messages serializable.
This commit is contained in:
parent
7e77285745
commit
9c9d7dc93b
15 changed files with 373 additions and 105 deletions
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use net_traits::{LoadData, Metadata, LoadConsumer};
|
||||
use net_traits::{LoadData, Metadata, LoadConsumer, SerializableStringResult};
|
||||
use net_traits::ProgressMsg::{Payload, Done};
|
||||
use mime_classifier::MIMEClassifier;
|
||||
use resource_task::start_sending;
|
||||
|
@ -26,23 +26,24 @@ pub fn load(load_data: LoadData, start_chan: LoadConsumer) {
|
|||
let url = load_data.url;
|
||||
assert!(&*url.scheme == "data");
|
||||
|
||||
let mut metadata = Metadata::default(url.clone());
|
||||
let mut metadata = Metadata::default((*url).clone());
|
||||
|
||||
// Split out content type and data.
|
||||
let mut scheme_data = match url.scheme_data {
|
||||
SchemeData::NonRelative(scheme_data) => scheme_data,
|
||||
SchemeData::NonRelative(ref scheme_data) => (*scheme_data).clone(),
|
||||
_ => panic!("Expected a non-relative scheme URL.")
|
||||
};
|
||||
match url.query {
|
||||
Some(query) => {
|
||||
Some(ref query) => {
|
||||
scheme_data.push_str("?");
|
||||
scheme_data.push_str(&query);
|
||||
scheme_data.push_str(query);
|
||||
},
|
||||
None => ()
|
||||
}
|
||||
let parts: Vec<&str> = scheme_data.splitn(2, ',').collect();
|
||||
if parts.len() != 2 {
|
||||
start_sending(start_chan, metadata).send(Done(Err("invalid data uri".to_string()))).unwrap();
|
||||
start_sending(start_chan, metadata).send(Done(SerializableStringResult(Err(
|
||||
"invalid data uri".to_string())))).unwrap();
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -69,15 +70,16 @@ pub fn load(load_data: LoadData, start_chan: LoadConsumer) {
|
|||
let bytes = bytes.into_iter().filter(|&b| b != ' ' as u8).collect::<Vec<u8>>();
|
||||
match bytes.from_base64() {
|
||||
Err(..) => {
|
||||
progress_chan.send(Done(Err("non-base64 data uri".to_string()))).unwrap();
|
||||
progress_chan.send(Done(SerializableStringResult(Err(
|
||||
"non-base64 data uri".to_string())))).unwrap();
|
||||
}
|
||||
Ok(data) => {
|
||||
progress_chan.send(Payload(data)).unwrap();
|
||||
progress_chan.send(Done(Ok(()))).unwrap();
|
||||
progress_chan.send(Done(SerializableStringResult(Ok(())))).unwrap();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
progress_chan.send(Payload(bytes)).unwrap();
|
||||
progress_chan.send(Done(Ok(()))).unwrap();
|
||||
progress_chan.send(Done(SerializableStringResult(Ok(())))).unwrap();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue