forked from mirrors/gecko-dev
0e04a592f6
Implement the task source API for the File Reader task source, enabling using task sources from non-main threads. --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix (partially) #7959 (github issue number if applicable). - [X] These changes do not require tests because they're refactoring existing code Source-Repo: https://github.com/servo/servo Source-Revision: 48a912f57ec51e55e7905983b2bf368a07a9902f
73 lines
2.4 KiB
Rust
73 lines
2.4 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::domexception::DOMErrorName;
|
|
use dom::filereader::{FileReader, TrustedFileReader, GenerationId, ReadMetaData};
|
|
use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory, ScriptChan};
|
|
use script_thread::{Runnable, RunnableWrapper};
|
|
use std::sync::Arc;
|
|
use task_source::TaskSource;
|
|
|
|
#[derive(JSTraceable)]
|
|
pub struct FileReadingTaskSource(pub Box<ScriptChan + Send + 'static>);
|
|
|
|
impl Clone for FileReadingTaskSource {
|
|
fn clone(&self) -> FileReadingTaskSource {
|
|
FileReadingTaskSource(self.0.clone())
|
|
}
|
|
}
|
|
|
|
impl TaskSource for FileReadingTaskSource {
|
|
fn queue_with_wrapper<T>(&self,
|
|
msg: Box<T>,
|
|
wrapper: &RunnableWrapper)
|
|
-> Result<(), ()>
|
|
where T: Runnable + Send + 'static {
|
|
self.0.send(CommonScriptMsg::RunnableMsg(ScriptThreadEventCategory::FileRead,
|
|
wrapper.wrap_runnable(msg)))
|
|
}
|
|
}
|
|
|
|
pub struct FileReadingRunnable {
|
|
task: FileReadingTask,
|
|
}
|
|
|
|
impl FileReadingRunnable {
|
|
pub fn new(task: FileReadingTask) -> Box<FileReadingRunnable> {
|
|
box FileReadingRunnable {
|
|
task: task
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Runnable for FileReadingRunnable {
|
|
fn handler(self: Box<FileReadingRunnable>) {
|
|
self.task.handle_task();
|
|
}
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
pub enum FileReadingTask {
|
|
ProcessRead(TrustedFileReader, GenerationId),
|
|
ProcessReadData(TrustedFileReader, GenerationId),
|
|
ProcessReadError(TrustedFileReader, GenerationId, DOMErrorName),
|
|
ProcessReadEOF(TrustedFileReader, GenerationId, ReadMetaData, Arc<Vec<u8>>),
|
|
}
|
|
|
|
impl FileReadingTask {
|
|
pub fn handle_task(self) {
|
|
use self::FileReadingTask::*;
|
|
|
|
match self {
|
|
ProcessRead(reader, gen_id) =>
|
|
FileReader::process_read(reader, gen_id),
|
|
ProcessReadData(reader, gen_id) =>
|
|
FileReader::process_read_data(reader, gen_id),
|
|
ProcessReadError(reader, gen_id, error) =>
|
|
FileReader::process_read_error(reader, gen_id, error),
|
|
ProcessReadEOF(reader, gen_id, metadata, blob_contents) =>
|
|
FileReader::process_read_eof(reader, gen_id, metadata, blob_contents),
|
|
}
|
|
}
|
|
}
|