diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 1a1a734d5b0..2cf7baff144 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -279,8 +279,6 @@ impl FileReader { fr.dispatch_progress_event(atom!("loadend"), 0, None); } return_on_abort!(); - // Step 9 - fr.terminate_ongoing_reading(); } // https://w3c.github.io/FileAPI/#dfn-readAsText @@ -443,6 +441,8 @@ impl FileReader { self.change_ready_state(FileReaderReadyState::Loading); // Step 3 + *self.result.borrow_mut() = None; + let blob_contents = Arc::new(blob.get_bytes().unwrap_or(vec![])); let type_ = blob.Type(); @@ -450,6 +450,9 @@ impl FileReader { let load_data = ReadMetaData::new(String::from(type_), label.map(String::from), function); let fr = Trusted::new(self); + + let GenerationId(prev_id) = self.generation_id.get(); + self.generation_id.set(GenerationId(prev_id + 1)); let gen_id = self.generation_id.get(); let global = self.global(); diff --git a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini b/tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini index 49bcce20688..ba923e54fa7 100644 --- a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini +++ b/tests/wpt/metadata/FileAPI/reading-data-section/filereader_result.html.ini @@ -2,27 +2,8 @@ [result is null during "loadstart" event for readAsBinaryString] expected: FAIL - [result is null during "loadstart" event for readAsDataURL] - expected: FAIL - - [result is null during "progress" event for readAsArrayBuffer] - expected: FAIL - [result is null during "progress" event for readAsBinaryString] expected: FAIL - [result is null during "loadstart" event for readAsArrayBuffer] - expected: FAIL - [readAsBinaryString] expected: FAIL - - [result is null during "progress" event for readAsDataURL] - expected: FAIL - - [result is null during "loadstart" event for readAsText] - expected: FAIL - - [result is null during "progress" event for readAsText] - expected: FAIL -