mirror of
https://github.com/servo/servo.git
synced 2025-06-08 00:23:30 +00:00
5f927a2c28
Create two new data structures in the `script` crate to hold senders and receiver: - `ScriptThreadSenders`: holds all outgoing channels from the `ScriptThread` including a channel to the `ScriptThread` itself. The ultimate goal with this is to reduce duplication by giving a boxed version of this this to `Window`s. - `ScriptThradReceivers`: holds all incoming channels to the `ScriptThread`. This isn't cloenable like the senders. This is used to abstract away `recv()` and `try_recv()` methods used to make the `ScriptThread` event loop easier to read. In addition: - The many duplicated `ScriptThread` self-senders for the `TaskManager` have been removed and, in general, a lot of boilerplate is removed as well. - Visibilty of all methods affected by this change is changed to `pub(crate)` in order to take advantage of dead code detection. Some dead code produced from macros is removed. - Some conversion code is refactord into implementations of the `From` trait. - The names of channels uses a standard "sender" and "receiver" naming as well as trying to be descriptive of where they go in `ScriptThread` as well as `InitialScriptState` Signed-off-by: Martin Robinson <mrobinson@igalia.com>
72 lines
2.4 KiB
Rust
72 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 https://mozilla.org/MPL/2.0/. */
|
|
|
|
use base::id::PipelineId;
|
|
|
|
use crate::dom::domexception::DOMErrorName;
|
|
use crate::dom::filereader::{FileReader, GenerationId, ReadMetaData, TrustedFileReader};
|
|
use crate::script_runtime::{CanGc, CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
|
|
use crate::task::{TaskCanceller, TaskOnce};
|
|
use crate::task_source::{TaskSource, TaskSourceName};
|
|
|
|
#[derive(JSTraceable)]
|
|
pub struct FileReadingTaskSource(
|
|
pub Box<dyn ScriptChan + Send + 'static>,
|
|
#[no_trace] pub PipelineId,
|
|
);
|
|
|
|
impl Clone for FileReadingTaskSource {
|
|
fn clone(&self) -> FileReadingTaskSource {
|
|
FileReadingTaskSource(self.0.as_boxed(), self.1)
|
|
}
|
|
}
|
|
|
|
impl TaskSource for FileReadingTaskSource {
|
|
const NAME: TaskSourceName = TaskSourceName::FileReading;
|
|
|
|
fn queue_with_canceller<T>(&self, task: T, canceller: &TaskCanceller) -> Result<(), ()>
|
|
where
|
|
T: TaskOnce + 'static,
|
|
{
|
|
self.0.send(CommonScriptMsg::Task(
|
|
ScriptThreadEventCategory::FileRead,
|
|
Box::new(canceller.wrap_task(task)),
|
|
Some(self.1),
|
|
FileReadingTaskSource::NAME,
|
|
))
|
|
}
|
|
}
|
|
|
|
impl TaskOnce for FileReadingTask {
|
|
fn run_once(self) {
|
|
self.handle_task(CanGc::note());
|
|
}
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
pub enum FileReadingTask {
|
|
ProcessRead(TrustedFileReader, GenerationId),
|
|
ProcessReadData(TrustedFileReader, GenerationId),
|
|
ProcessReadError(TrustedFileReader, GenerationId, DOMErrorName),
|
|
ProcessReadEOF(TrustedFileReader, GenerationId, ReadMetaData, Vec<u8>),
|
|
}
|
|
|
|
impl FileReadingTask {
|
|
pub fn handle_task(self, can_gc: CanGc) {
|
|
use self::FileReadingTask::*;
|
|
|
|
match self {
|
|
ProcessRead(reader, gen_id) => FileReader::process_read(reader, gen_id, can_gc),
|
|
ProcessReadData(reader, gen_id) => {
|
|
FileReader::process_read_data(reader, gen_id, can_gc)
|
|
},
|
|
ProcessReadError(reader, gen_id, error) => {
|
|
FileReader::process_read_error(reader, gen_id, error, can_gc)
|
|
},
|
|
ProcessReadEOF(reader, gen_id, metadata, blob_contents) => {
|
|
FileReader::process_read_eof(reader, gen_id, metadata, blob_contents, can_gc)
|
|
},
|
|
}
|
|
}
|
|
}
|