diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-24 22:17:15 -0500 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-24 22:17:15 -0500 |
| commit | 0b64586bf5368f6bb200353205459c7ec88f7052 (patch) | |
| tree | c28c6a44d9005902de9da548bbc01a43349059bc /components/script/dom/file.rs | |
| parent | b6e06bd83740ea5dc3385f88daf88677fc676f11 (diff) | |
| parent | 96b20931212515f279930c7b69e471b833463886 (diff) | |
| download | servo-0b64586bf5368f6bb200353205459c7ec88f7052.tar.gz servo-0b64586bf5368f6bb200353205459c7ec88f7052.zip | |
Auto merge of #11368 - izgzhen:fix-filemanager-exit, r=asajeffrey
Fix FileManager thread panic and other misc improvements
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy --faster` does not report any errors
- [x] There are tests for these changes
Changes:
- Add shut down logic for FileManager thread
- Add an unit test for filemanager_thread
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11368)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/file.rs')
| -rw-r--r-- | components/script/dom/file.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index 62e1b0a95bd..f566b4426b4 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -51,8 +51,6 @@ impl File { pub fn new_from_selected(window: &Window, selected: SelectedFile) -> Root<File> { let name = DOMString::from(selected.filename.to_str().expect("File name encoding error")); - // FIXME: fix this after PR #11221 is landed - let id = selected.id; let slice = DataSlice::empty(); let global = GlobalRef::Window(window); |