Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove FileReadingRunnable

Browse source
This commit is contained in:
Anthony Ramine 2017-09-16 03:17:35 +02:00
parent 56117d3185
commit 4a39631eaf
2 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/dom/filereader.rs
View file

@ -36,7 +36,7 @@ use std::ptr;
use std::sync::Arc; use std::sync::Arc;
use std::thread; use std::thread;
use task_source::TaskSource; 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)] #[derive(Clone, Copy, HeapSizeOf, JSTraceable, PartialEq)]
pub enum FileReaderFunction { pub enum FileReaderFunction {
@ -415,12 +415,12 @@ fn perform_annotated_read_operation(
canceller: TaskCanceller, canceller: TaskCanceller,
) { ) {
// Step 4 // Step 4
let task = FileReadingRunnable::new(FileReadingTask::ProcessRead(filereader.clone(), gen_id)); let task = FileReadingTask::ProcessRead(filereader.clone(), gen_id);
task_source.queue_with_canceller(task, &canceller).unwrap(); task_source.queue_with_canceller(box task, &canceller).unwrap();
let task = FileReadingRunnable::new(FileReadingTask::ProcessReadData(filereader.clone(), gen_id)); let task = FileReadingTask::ProcessReadData(filereader.clone(), gen_id);
task_source.queue_with_canceller(task, &canceller).unwrap(); task_source.queue_with_canceller(box task, &canceller).unwrap();
let task = FileReadingRunnable::new(FileReadingTask::ProcessReadEOF(filereader, gen_id, data, blob_contents)); let task = FileReadingTask::ProcessReadEOF(filereader, gen_id, data, blob_contents);
task_source.queue_with_canceller(task, &canceller).unwrap(); task_source.queue_with_canceller(box task, &canceller).unwrap();
} }

18
components/script/task_source/file_reading.rs
View file

@ -34,21 +34,9 @@ impl TaskSource for FileReadingTaskSource {
} }
} }
pub struct FileReadingRunnable { impl Task for FileReadingTask {
task: FileReadingTask, fn run(self: Box<Self>) {
} self.handle_task();
impl FileReadingRunnable {
pub fn new(task: FileReadingTask) -> Box<FileReadingRunnable> {
box FileReadingRunnable {
task: task
}
}
}
impl Task for FileReadingRunnable {
fn run(self: Box<FileReadingRunnable>) {
self.task.handle_task();
} }
} }