Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replaced DOMString by String in filereader.

Browse source
This commit is contained in:
Alan Jeffrey 2015-11-10 15:53:54 -06:00
parent 5101506089
commit 582273eb07
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script/dom/filereader.rs
View file

@ -40,14 +40,14 @@ pub type TrustedFileReader = Trusted<FileReader>;
#[derive(Clone, HeapSizeOf)] #[derive(Clone, HeapSizeOf)]
pub struct ReadMetaData { pub struct ReadMetaData {
pub blobtype: DOMString, pub blobtype: String,
pub label: Option<DOMString>, pub label: Option<String>,
pub function: FileReaderFunction pub function: FileReaderFunction
} }
impl ReadMetaData { impl ReadMetaData {
pub fn new(blobtype: DOMString, pub fn new(blobtype: String,
label: Option<DOMString>, function: FileReaderFunction) -> ReadMetaData { label: Option<String>, function: FileReaderFunction) -> ReadMetaData {
ReadMetaData { ReadMetaData {
blobtype: blobtype, blobtype: blobtype,
label: label, label: label,
@ -358,7 +358,7 @@ impl FileReader {
blob.read_out_buffer(send); blob.read_out_buffer(send);
let type_ = blob.Type(); let type_ = blob.Type();
let load_data = ReadMetaData::new(type_, label, function); let load_data = ReadMetaData::new(String::from(type_), label.map(String::from), function);
let fr = Trusted::new(global.get_cx(), self, global.script_chan()); let fr = Trusted::new(global.get_cx(), self, global.script_chan());
let gen_id = self.generation_id.get(); let gen_id = self.generation_id.get();
@ -379,7 +379,7 @@ impl FileReader {
#[derive(Clone)] #[derive(Clone)]
pub enum FileReaderEvent { pub enum FileReaderEvent {
ProcessRead(TrustedFileReader, GenerationId), ProcessRead(TrustedFileReader, GenerationId),
ProcessReadData(TrustedFileReader, GenerationId, DOMString), ProcessReadData(TrustedFileReader, GenerationId),
ProcessReadError(TrustedFileReader, GenerationId, DOMErrorName), ProcessReadError(TrustedFileReader, GenerationId, DOMErrorName),
ProcessReadEOF(TrustedFileReader, GenerationId, ReadMetaData, Vec<u8>) ProcessReadEOF(TrustedFileReader, GenerationId, ReadMetaData, Vec<u8>)
} }
@ -391,7 +391,7 @@ impl Runnable for FileReaderEvent {
FileReaderEvent::ProcessRead(filereader, gen_id) => { FileReaderEvent::ProcessRead(filereader, gen_id) => {
FileReader::process_read(filereader, gen_id); FileReader::process_read(filereader, gen_id);
}, },
FileReaderEvent::ProcessReadData(filereader, gen_id, _) => { FileReaderEvent::ProcessReadData(filereader, gen_id) => {
FileReader::process_read_data(filereader, gen_id); FileReader::process_read_data(filereader, gen_id);
}, },
FileReaderEvent::ProcessReadError(filereader, gen_id, error) => { FileReaderEvent::ProcessReadError(filereader, gen_id, error) => {
@ -412,8 +412,7 @@ fn perform_annotated_read_operation(gen_id: GenerationId, data: ReadMetaData, bl
let task = box FileReaderEvent::ProcessRead(filereader.clone(), gen_id); let task = box FileReaderEvent::ProcessRead(filereader.clone(), gen_id);
chan.send(CommonScriptMsg::RunnableMsg(FileRead, task)).unwrap(); chan.send(CommonScriptMsg::RunnableMsg(FileRead, task)).unwrap();
let task = box FileReaderEvent::ProcessReadData(filereader.clone(), let task = box FileReaderEvent::ProcessReadData(filereader.clone(), gen_id);
gen_id, DOMString::new());
chan.send(CommonScriptMsg::RunnableMsg(FileRead, task)).unwrap(); chan.send(CommonScriptMsg::RunnableMsg(FileRead, task)).unwrap();
let bytes = match blob_contents.recv() { let bytes = match blob_contents.recv() {