diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2025-01-01 14:50:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-01 13:50:52 +0000 |
| commit | 77cfca65c441ff1f8b54a507c9802e7ae6893e62 (patch) | |
| tree | a7d141eb43f22a94ba6f4a548e0346e9358d49c5 /components/script/body.rs | |
| parent | deb819f23368ed43b9312a439e48f9d5f961930c (diff) | |
| download | servo-77cfca65c441ff1f8b54a507c9802e7ae6893e62.tar.gz servo-77cfca65c441ff1f8b54a507c9802e7ae6893e62.zip | |
script: Eliminate code duplication in the task queue (#34798)
Instead of creating a type for each `TaskSource` variety have each `TaskSource`
hold the same kind of sender (this was inconsistent before, but each
sender was effectively the same trait object), a pipeline, and a
`TaskSourceName`. This elminates the need to reimplement the same
queuing code for every task source.
In addition, have workers hold their own `TaskManager`. This allows just
exposing the manager on the `GlobalScope`. Currently the `TaskCanceller`
is different, but this will also be eliminated in a followup change.
This is a the first step toward having a shared set of `Sender`s on
`GlobalScope`.
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/script/body.rs')
| -rw-r--r-- | components/script/body.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/body.rs b/components/script/body.rs index d84e39cd2f9..0d625ac1ff4 100644 --- a/components/script/body.rs +++ b/components/script/body.rs @@ -41,7 +41,6 @@ use crate::dom::urlsearchparams::URLSearchParams; use crate::realms::{enter_realm, AlreadyInRealm, InRealm}; use crate::script_runtime::{CanGc, JSContext}; use crate::task::TaskCanceller; -use crate::task_source::networking::NetworkingTaskSource; use crate::task_source::{TaskSource, TaskSourceName}; /// The Dom object, or ReadableStream, that is the source of a body. @@ -72,7 +71,7 @@ enum StopReading { #[derive(Clone)] struct TransmitBodyConnectHandler { stream: Trusted<ReadableStream>, - task_source: NetworkingTaskSource, + task_source: TaskSource, canceller: TaskCanceller, bytes_sender: Option<IpcSender<BodyChunkResponse>>, control_sender: IpcSender<BodyChunkRequest>, @@ -84,7 +83,7 @@ struct TransmitBodyConnectHandler { impl TransmitBodyConnectHandler { pub fn new( stream: Trusted<ReadableStream>, - task_source: NetworkingTaskSource, + task_source: TaskSource, canceller: TaskCanceller, control_sender: IpcSender<BodyChunkRequest>, in_memory: Option<Vec<u8>>, @@ -379,7 +378,7 @@ impl ExtractedBody { let trusted_stream = Trusted::new(&*stream); let global = stream.global(); - let task_source = global.networking_task_source(); + let task_source = global.task_manager().networking_task_source(); let canceller = global.task_canceller(TaskSourceName::Networking); // In case of the data being in-memory, send everything in one chunk, by-passing SM. |