mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +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>
46 lines
1.3 KiB
Rust
46 lines
1.3 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 std::fmt;
|
|
|
|
use base::id::PipelineId;
|
|
|
|
use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
|
|
use crate::task::{TaskCanceller, TaskOnce};
|
|
use crate::task_source::{TaskSource, TaskSourceName};
|
|
|
|
#[derive(JSTraceable)]
|
|
pub struct PortMessageQueue(
|
|
pub Box<dyn ScriptChan + Send + 'static>,
|
|
#[no_trace] pub PipelineId,
|
|
);
|
|
|
|
impl Clone for PortMessageQueue {
|
|
fn clone(&self) -> PortMessageQueue {
|
|
PortMessageQueue(self.0.as_boxed(), self.1)
|
|
}
|
|
}
|
|
|
|
impl fmt::Debug for PortMessageQueue {
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
write!(f, "PortMessageQueue(...)")
|
|
}
|
|
}
|
|
|
|
impl TaskSource for PortMessageQueue {
|
|
const NAME: TaskSourceName = TaskSourceName::PortMessage;
|
|
|
|
fn queue_with_canceller<T>(&self, task: T, canceller: &TaskCanceller) -> Result<(), ()>
|
|
where
|
|
T: TaskOnce + 'static,
|
|
{
|
|
let msg = CommonScriptMsg::Task(
|
|
ScriptThreadEventCategory::PortMessage,
|
|
Box::new(canceller.wrap_task(task)),
|
|
Some(self.1),
|
|
Self::NAME,
|
|
);
|
|
self.0.send(msg).map_err(|_| ())
|
|
}
|
|
}
|