aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/filereader.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-07-10 08:23:34 -0400
committerGitHub <noreply@github.com>2018-07-10 08:23:34 -0400
commit8988d674d0cbea59eaaa8c80f36f29d214682a0b (patch)
treeb661e8bbf9be062af35f5d1eb8eda80de7918dfd /components/script/dom/filereader.rs
parent2bc70e738b01051a64f2183691e0abd9a0f84072 (diff)
parent671627e97e20ae4baf728ae6dda61ef6f857c193 (diff)
downloadservo-8988d674d0cbea59eaaa8c80f36f29d214682a0b.tar.gz
servo-8988d674d0cbea59eaaa8c80f36f29d214682a0b.zip
Auto merge of #21126 - gterzian:tasksource_specific_cancelation, r=jdm
Introduce "per task source" cancellation <!-- 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: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #21119 (github issue number if applicable). <!-- Either: --> - [ ] 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/21126) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/filereader.rs')
-rw-r--r--components/script/dom/filereader.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs
index 037e54907c0..6b88c645bbd 100644
--- a/components/script/dom/filereader.rs
+++ b/components/script/dom/filereader.rs
@@ -35,7 +35,7 @@ use std::ptr;
use std::sync::Arc;
use std::thread;
use task::TaskCanceller;
-use task_source::TaskSource;
+use task_source::{TaskSource, TaskSourceName};
use task_source::file_reading::{FileReadingTask, FileReadingTaskSource};
#[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq)]
@@ -452,7 +452,7 @@ impl FileReader {
let gen_id = self.generation_id.get();
let global = self.global();
- let canceller = global.task_canceller();
+ let canceller = global.task_canceller(TaskSourceName::FileReading);
let task_source = global.file_reading_task_source();
thread::Builder::new()