FIXES

components/script/dom/filereader.rs

@@ -26,22 +26,31 @@ use std::cell::{Cell, RefCell};
 use std::sync::mpsc::Receiver;
 use util::str::DOMString;
 use util::task::spawn_named;
+use rustc_serialize::base64::{Config, ToBase64, CharacterSet, Newline};
+
+#[derive(PartialEq, Clone, Copy, JSTraceable)]
+pub enum FileReaderFunction {
+    ReadAsText,
+    ReadAsDataUrl,
+}
 
 pub type TrustedFileReader = Trusted<FileReader>;
 
 pub struct ReadData {
     pub bytes: Receiver<Option<Vec<u8>>>,
     pub blobtype: DOMString,
-    pub label: Option<DOMString>
+    pub label: Option<DOMString>,
+    pub function: FileReaderFunction
 }
 
 impl ReadData {
     pub fn new(bytes: Receiver<Option<Vec<u8>>>, blobtype: DOMString,
-               label: Option<DOMString>) -> ReadData {
+               label: Option<DOMString>, function: FileReaderFunction) -> ReadData {
         ReadData {
             bytes: bytes,
             blobtype: blobtype,
-            label: label
+            label: label,
+            function: function,
         }
     }
 }
@@ -104,13 +113,10 @@ impl FileReader {
         // Step 1
         fr.change_ready_state(FileReaderReadyState::Done);
         *fr.result.borrow_mut() = None;
-        return_on_abort!();
 
-        //FIXME set error attribute
         let global = fr.global.root();
         let exception = DOMException::new(global.r(), error);
         fr.error.set(Some(JS::from_rooted(&exception)));
-        return_on_abort!();
 
         fr.dispatch_progress_event("error".to_owned(), 0, None);
         return_on_abort!();
@@ -193,7 +199,25 @@ impl<'a> FileReaderMethods for &'a FileReader {
     event_handler!(loadend, GetOnloadend, SetOnloadend);
 
     //TODO https://w3c.github.io/FileAPI/#dfn-readAsArrayBuffer
-    //TODO https://w3c.github.io/FileAPI/#dfn-readAsDataURL
+    //https://w3c.github.io/FileAPI/#dfn-readAsDataURL
+    fn ReadAsDataURL(self, blob: &Blob) -> ErrorResult {
+        let global = self.global.root();
+        // Step 1
+        if self.ready_state.get() == FileReaderReadyState::Loading {
+            return Err(InvalidState);
+        }
+        //TODO STEP 2 if isClosed implemented in Blob
+
+        // Step 3
+        self.change_ready_state(FileReaderReadyState::Loading);
+
+        let bytes = blob.read_out_buffer();
+        let type_ = blob.read_out_type();
+
+        let load_data = ReadData::new(bytes, type_, None, FileReaderFunction::ReadAsDataUrl);
+
+        self.read(load_data, global.r())
+    }
 
     // https://w3c.github.io/FileAPI/#dfn-readAsText
     fn ReadAsText(self, blob: &Blob, label:Option<DOMString>) -> ErrorResult {
@@ -210,7 +234,7 @@ impl<'a> FileReaderMethods for &'a FileReader {
         let bytes = blob.read_out_buffer();
         let type_ = blob.read_out_type();
 
-        let load_data = ReadData::new(bytes, type_, label);
+        let load_data = ReadData::new(bytes, type_, label, FileReaderFunction::ReadAsText);
 
         self.read(load_data, global.r())
     }
@@ -224,7 +248,7 @@ impl<'a> FileReaderMethods for &'a FileReader {
         }
         // Steps 1 & 3
         *self.result.borrow_mut() = None;
-        //FIXME set error
+
         let global = self.global.root();
         let exception = DOMException::new(global.r(), DOMErrorName::AbortError);
         self.error.set(Some(JS::from_rooted(&exception)));
@@ -301,7 +325,7 @@ pub enum Process {
 }
 
 impl Process {
-    fn call(self, chan: Box<ScriptChan + Send>) {
+    fn call(self, chan: &Box<ScriptChan + Send>) {
         let task = box FileReaderEvent::new(self);
         chan.send(ScriptMsg::RunnableMsg(task)).unwrap();
     }
@@ -346,12 +370,24 @@ impl Runnable for FileReaderEvent {
 
 fn perform_annotated_read_operation(gen_id: GenerationId, read_data: ReadData,
     filereader: TrustedFileReader, chan: Box<ScriptChan + Send>) {
+    match read_data.function {
+        FileReaderFunction::ReadAsDataUrl => perform_read_dataurl(gen_id,
+            read_data, filereader, chan),
+        FileReaderFunction::ReadAsText => perform_read_text(gen_id,
+            read_data, filereader, chan),
+    }
+}
+
+// https://w3c.github.io/FileAPI/#dfn-readAsText
+fn perform_read_text(gen_id: GenerationId, read_data: ReadData,
+    filereader: TrustedFileReader, script_chan: Box<ScriptChan + Send>) {
+    let chan = &script_chan;
     // Step 4
     Process::ProcessRead(filereader.clone(),
-        gen_id).call(chan.clone());
+        gen_id).call(chan);
 
     Process::ProcessReadData(filereader.clone(),
-        gen_id, DOMString::new()).call(chan.clone());
+        gen_id, DOMString::new()).call(chan);
     let encoding = match read_data.label {
         Some(e) => encoding_from_whatwg_label(&e),
         None => Some(UTF_8 as EncodingRef)
@@ -383,7 +419,7 @@ fn perform_annotated_read_operation(gen_id: GenerationId, read_data: ReadData,
     };
     // Step 5
     Process::ProcessReadData(filereader.clone(),
-        gen_id, DOMString::new()).call(chan.clone());
+        gen_id, DOMString::new()).call(chan);
     let (_, convert) = input.split_at(0);
 
     let output = enc.decode(convert, DecoderTrap::Strict);
@@ -394,3 +430,52 @@ fn perform_annotated_read_operation(gen_id: GenerationId, read_data: ReadData,
             gen_id, DOMErrorName::InvalidCharacterError).call(chan)
     };
 }
+
+//https://w3c.github.io/FileAPI/#dfn-readAsDataURL
+fn perform_read_dataurl(gen_id: GenerationId, read_data: ReadData,
+    filereader: TrustedFileReader, script_chan: Box<ScriptChan + Send>) {
+    let chan = &script_chan;
+    // Step 4
+    Process::ProcessRead(filereader.clone(),
+        gen_id).call(chan);
+
+    Process::ProcessReadData(filereader.clone(),
+        gen_id, DOMString::new()).call(chan);
+
+    let bytes = match read_data.bytes.recv() {
+        Ok(data) => data,
+        Err(_) => {
+            Process::ProcessReadError(filereader,
+                gen_id, DOMErrorName::NotFoundError).call(chan);
+            return;
+        }
+    };
+    let config = Config {
+        char_set: CharacterSet::UrlSafe,
+        newline: Newline::LF,
+        pad: true,
+        line_length: None
+    };
+    let base64 = match bytes {
+        Some(bytes) => bytes.to_base64(config),
+        None => {
+            Process::ProcessReadEOF(filereader,
+                gen_id, DOMString::new()).call(chan);
+            return;
+        }
+    };
+    // Step 5
+    Process::ProcessReadData(filereader.clone(),
+        gen_id, DOMString::new()).call(chan);
+
+    //dom/base/nsDOMFileReader.cpp
+    let type_ = if read_data.blobtype.is_empty() {
+        DOMString::from("application/octet-stream")
+    } else {
+        read_data.blobtype
+    };
+
+    let output = format!("data:{};base64,{}", type_, base64);
+
+    Process::ProcessReadEOF(filereader, gen_id, output).call(chan);
+}

components/script/dom/webidls/FileReader.webidl

@@ -17,8 +17,8 @@ interface FileReader: EventTarget {
   //void readAsArrayBuffer(Blob blob);
   [Throws]
   void readAsText(Blob blob, optional DOMString label);
-  //[Throws]
-  //void readAsDataURL(Blob blob);
+  [Throws]
+  void readAsDataURL(Blob blob);
 
   void abort();
 

tests/wpt/metadata/FileAPI/idlharness.html.ini

@@ -120,18 +120,9 @@
   [FileReader interface: operation readAsArrayBuffer(Blob)]
     expected: FAIL
 
-  [FileReader interface: operation readAsDataURL(Blob)]
-    expected: FAIL
-
   [FileReader interface: new FileReader() must inherit property "readAsArrayBuffer" with the proper type (0)]
     expected: FAIL
 
   [FileReader interface: calling readAsArrayBuffer(Blob) on new FileReader() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FileReader interface: new FileReader() must inherit property "readAsDataURL" with the proper type (2)]
-    expected: FAIL
-
-  [FileReader interface: calling readAsDataURL(Blob) on new FileReader() with too few arguments must throw TypeError]
-    expected: FAIL
-

tests/wpt/metadata/FileAPI/reading-data-section/FileReader-multiple-reads.html.ini

@@ -3,9 +3,6 @@
   [test FileReader no InvalidStateError exception in onloadstart event for readAsArrayBuffer]
     expected: FAIL
 
-  [test FileReader InvalidStateError exception for readAsDataURL]
-    expected: FAIL
-
   [test FileReader InvalidStateError exception for readAsArrayBuffer]
     expected: FAIL
 

tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini

@@ -1,8 +1,5 @@
 [filereader_result.html]
   type: testharness
-  [readAsDataURL]
-    expected: FAIL
-
   [readAsArrayBuffer]
     expected: FAIL