Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't send progress event for empty blob #24312

Merged
merged 1 commit into from Oct 10, 2019
Merged

Conversation

@SiddharthaMishra
Copy link
Contributor

SiddharthaMishra commented Sep 28, 2019


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #24289 (GitHub issue number if applicable)
  • There are tests for these changes OR
  • These changes do not require tests because ___

This change is Reviewable

@highfive
Copy link

highfive commented Sep 28, 2019

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @jdm (or someone else) soon.

@highfive
Copy link

highfive commented Sep 28, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/task_source/file_reading.rs, components/script/dom/filereader.rs
  • @KiChjang: components/script/task_source/file_reading.rs, components/script/dom/filereader.rs
@@ -1,9 +1,9 @@
[filereader_events.any.html]
[events are dispatched in the correct order for an empty blob]
expected: FAIL
expected: PASS

This comment has been minimized.

Copy link
@atouchet

atouchet Sep 28, 2019

Contributor

You can delete this file instead of marking these tests as PASS.

@SiddharthaMishra SiddharthaMishra force-pushed the SiddharthaMishra:master branch from aeba242 to ef3f7c2 Sep 28, 2019
@@ -491,7 +497,7 @@ 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);
let task = FileReadingTask::ProcessReadData(filereader.clone(), gen_id, blob_contents.clone());

This comment has been minimized.

Copy link
@jdm

jdm Sep 30, 2019

Member

I suggest instead of passing the blob_contents to this task, we check whether blob_contents is empty and skip it entirely. This will make many of the other changes in this PR unnecessary.

@jdm
Copy link
Member

jdm commented Oct 10, 2019

@bors-servo try=wpt

bors-servo added a commit that referenced this pull request Oct 10, 2019
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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2019

Trying commit fbf7293 with merge f3b9944...

@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2019

💔 Test failed - linux-rel-wpt

@jdm
Copy link
Member

jdm commented Oct 10, 2019

Hooray, new passing tests! You can remove this file and add the change to the existing commit in this PR.

@jdm
Copy link
Member

jdm commented Oct 10, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2019

📌 Commit 6735b68 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2019

Testing commit 6735b68 with merge ec21144...

bors-servo added a commit that referenced this pull request Oct 10, 2019
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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2019

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Oct 10, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2019

Testing commit 6735b68 with merge b3a97f2...

bors-servo added a commit that referenced this pull request Oct 10, 2019
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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing b3a97f2 to master...

@bors-servo bors-servo merged commit 6735b68 into servo:master Oct 10, 2019
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
Taskcluster (pull_request) TaskGroup: success
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants
You can’t perform that action at this time.