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

FileReader.read sets result to null before performing read operation

Browse source
This commit is contained in:
Micah Tigley 2019-09-30 22:34:45 -04:00
parent a6caccfdd6
commit a775392638
2 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,8 +279,6 @@ impl FileReader {
fr.dispatch_progress_event(atom!("loadend"), 0, None); fr.dispatch_progress_event(atom!("loadend"), 0, None);
} }
return_on_abort!(); return_on_abort!();
// Step 9
fr.terminate_ongoing_reading();
} }
// https://w3c.github.io/FileAPI/#dfn-readAsText // https://w3c.github.io/FileAPI/#dfn-readAsText
@ -443,6 +441,8 @@ impl FileReader {
self.change_ready_state(FileReaderReadyState::Loading); self.change_ready_state(FileReaderReadyState::Loading);
// Step 3 // Step 3
*self.result.borrow_mut() = None;
let blob_contents = Arc::new(blob.get_bytes().unwrap_or(vec![])); let blob_contents = Arc::new(blob.get_bytes().unwrap_or(vec![]));
let type_ = blob.Type(); let type_ = blob.Type();
@ -450,6 +450,9 @@ impl FileReader {
let load_data = ReadMetaData::new(String::from(type_), label.map(String::from), function); let load_data = ReadMetaData::new(String::from(type_), label.map(String::from), function);
let fr = Trusted::new(self); 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 gen_id = self.generation_id.get();
let global = self.global(); let global = self.global();

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

@ -2,27 +2,8 @@
[result is null during "loadstart" event for readAsBinaryString] [result is null during "loadstart" event for readAsBinaryString]
expected: FAIL 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] [result is null during "progress" event for readAsBinaryString]
expected: FAIL expected: FAIL
[result is null during "loadstart" event for readAsArrayBuffer]
expected: FAIL
[readAsBinaryString] [readAsBinaryString]
expected: FAIL 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