diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 91f16559bd5..d954e1431ef 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -36,7 +36,7 @@ use std::ptr; use std::sync::Arc; use std::thread; use task_source::TaskSource; -use task_source::file_reading::{FileReadingTaskSource, FileReadingRunnable, FileReadingTask}; +use task_source::file_reading::{FileReadingTask, FileReadingTaskSource}; #[derive(Clone, Copy, HeapSizeOf, JSTraceable, PartialEq)] pub enum FileReaderFunction { @@ -415,12 +415,12 @@ fn perform_annotated_read_operation( canceller: TaskCanceller, ) { // Step 4 - let task = FileReadingRunnable::new(FileReadingTask::ProcessRead(filereader.clone(), gen_id)); - task_source.queue_with_canceller(task, &canceller).unwrap(); + let task = FileReadingTask::ProcessRead(filereader.clone(), gen_id); + task_source.queue_with_canceller(box task, &canceller).unwrap(); - let task = FileReadingRunnable::new(FileReadingTask::ProcessReadData(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(box task, &canceller).unwrap(); - let task = FileReadingRunnable::new(FileReadingTask::ProcessReadEOF(filereader, gen_id, data, blob_contents)); - task_source.queue_with_canceller(task, &canceller).unwrap(); + let task = FileReadingTask::ProcessReadEOF(filereader, gen_id, data, blob_contents); + task_source.queue_with_canceller(box task, &canceller).unwrap(); } diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs index 433cc78c260..dc9a6a751dd 100644 --- a/components/script/task_source/file_reading.rs +++ b/components/script/task_source/file_reading.rs @@ -34,21 +34,9 @@ impl TaskSource for FileReadingTaskSource { } } -pub struct FileReadingRunnable { - task: FileReadingTask, -} - -impl FileReadingRunnable { - pub fn new(task: FileReadingTask) -> Box { - box FileReadingRunnable { - task: task - } - } -} - -impl Task for FileReadingRunnable { - fn run(self: Box) { - self.task.handle_task(); +impl Task for FileReadingTask { + fn run(self: Box) { + self.handle_task(); } }