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.

Sign up for GitHub

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

Jump to bottom

Add cancellability to file manager load and related refactoring #12684

Merged
merged 1 commit into from
Aug 2, 2016
Merged

Add cancellability to file manager load and related refactoring #12684

merged 1 commit into from
Aug 2, 2016

Conversation

izgzhen
Copy link
Contributor

@izgzhen izgzhen commented Aug 1, 2016 •
edited by larsbergstrom
Loading

Fixes #12589.

r? @Manishearth

This change is Reviewable

@highfive
Copy link

highfive commented Aug 1, 2016

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/constellation.rs
  • @KiChjang: components/net/filemanager_thread.rs, components/script/dom/bindings/global.rs, components/script/dom/blob.rs, components/net/resource_thread.rs, components/script/dom/url.rs, components/net/blob_loader.rs, components/net_traits/lib.rs, components/net_traits/lib.rs, components/script/dom/htmlinputelement.rs, components/net_traits/filemanager_thread.rs, components/net_traits/filemanager_thread.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 1, 2016
@izgzhen
Copy link
Contributor Author

izgzhen commented Aug 1, 2016

Another patch for mis-design :/

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #12579) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Aug 2, 2016
@Manishearth
Copy link
Member

@bors-servo r+

Don't worry about the mis-design, happens all the time 😄

@bors-servo
Copy link
Contributor

📌 Commit c2215ca has been approved by Manishearth

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Aug 2, 2016
@Manishearth
Copy link
Member

@bors-servo r-

needs rebase

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 2, 2016
@izgzhen
Copy link
Contributor Author

izgzhen commented Aug 2, 2016

done

@KiChjang
Copy link
Contributor

KiChjang commented Aug 2, 2016

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

📌 Commit 17ae38a has been approved by Manishearth

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Aug 2, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 17ae38a with merge b2f69f3...

bors-servo pushed a commit that referenced this pull request Aug 2, 2016
Auto merge of #12684 - izgzhen:cancel-file-manager, r=Manishearth
b2f69f3 
Add cancellability to file manager load and related refactoring

Fixes #12589.

r? @Manishearth

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #12589
- [x] There are tests for these changes OR

<!-- 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/12684)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-css

@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 2, 2016
@highfive
Copy link

highfive commented Aug 2, 2016 

  ▶ TIMEOUT [expected FAIL] /css-flexbox-1_dev/html/flexbox-writing-mode-003.htm

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Aug 2, 2016
@KiChjang
Copy link
Contributor

KiChjang commented Aug 2, 2016

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for arm32, arm64, linux-dev, mac-dev-unit, windows-dev are reusable. Rebuilding only linux-rel, mac-rel-css, mac-rel-wpt...

@bors-servo
Copy link
Contributor

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

@bors-servo bors-servo merged commit 17ae38a into servo:master Aug 2, 2016
@bors-servo bors-servo mentioned this pull request Aug 2, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Utilise cancel listener for reading content from file manager
5 participants
@izgzhen @highfive @bors-servo @Manishearth @KiChjang