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

Auto merge of #24312 - SiddharthaMishra:master, r=jdm

Browse source 
don't send progress event for empty blob

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #24289 (GitHub issue number if applicable)

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24312)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-10-10 17:50:37 -04:00 • committed by GitHub
commit b3a97f29e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -494,8 +494,10 @@ fn perform_annotated_read_operation(
let task = FileReadingTask::ProcessRead(filereader.clone(), gen_id); let task = FileReadingTask::ProcessRead(filereader.clone(), gen_id);
task_source.queue_with_canceller(task, &canceller).unwrap(); task_source.queue_with_canceller(task, &canceller).unwrap();
let task = FileReadingTask::ProcessReadData(filereader.clone(), gen_id); if !blob_contents.is_empty() {
task_source.queue_with_canceller(task, &canceller).unwrap(); let task = FileReadingTask::ProcessReadData(filereader.clone(), gen_id);
task_source.queue_with_canceller(task, &canceller).unwrap();
}
let task = FileReadingTask::ProcessReadEOF(filereader, gen_id, data, blob_contents); let task = FileReadingTask::ProcessReadEOF(filereader, gen_id, data, blob_contents);
task_source.queue_with_canceller(task, &canceller).unwrap(); task_source.queue_with_canceller(task, &canceller).unwrap();

9
tests/wpt/metadata/FileAPI/reading-data-section/filereader_events.any.js.ini
View file

@ -1,9 +0,0 @@
[filereader_events.any.html]
[events are dispatched in the correct order for an empty blob]
expected: FAIL
[filereader_events.any.worker.html]
[events are dispatched in the correct order for an empty blob]
expected: FAIL