From 6735b68a00837562c5ca24473c845ad6e3ac7d65 Mon Sep 17 00:00:00 2001 From: Siddhartha Mishra Date: Wed, 9 Oct 2019 23:33:02 +0530 Subject: [PATCH] don't send progress event for empty blob --- components/script/dom/filereader.rs | 6 ++++-- .../reading-data-section/filereader_events.any.js.ini | 9 --------- 2 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 tests/wpt/metadata/FileAPI/reading-data-section/filereader_events.any.js.ini diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 2cf7baff144..95b0572c3c5 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -494,8 +494,10 @@ fn perform_annotated_read_operation( let task = FileReadingTask::ProcessRead(filereader.clone(), gen_id); task_source.queue_with_canceller(task, &canceller).unwrap(); - let task = FileReadingTask::ProcessReadData(filereader.clone(), gen_id); - task_source.queue_with_canceller(task, &canceller).unwrap(); + if !blob_contents.is_empty() { + 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); task_source.queue_with_canceller(task, &canceller).unwrap(); diff --git a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_events.any.js.ini b/tests/wpt/metadata/FileAPI/reading-data-section/filereader_events.any.js.ini deleted file mode 100644 index 7f3c6796ed5..00000000000 --- a/tests/wpt/metadata/FileAPI/reading-data-section/filereader_events.any.js.ini +++ /dev/null @@ -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 -