mirror of
https://github.com/servo/servo.git
synced 2025-06-13 19:04:30 +00:00
75eb94afca
I moved away from the `Window` struct all the logic to handle task sources, into a new struct called `TaskManager`. In a happy world, I'd be able to just have there two functions, of the types: ```rust fn task_source<T: TaskSource>(&self, name: TaskSourceName) -> Box<T> fn task_source_with_canceller<T: TaskSource>(&self, name: TaskSourceName) -> (Box<T>, TaskSourceCanceller) ``` And not so much duplicated code. However, because TaskSource can't be a trait object (because it has generic type parameters), that's not possible. Instead, I decided to reduce duplicated logic through macros. For reasons[1], I have to pass both the name of the function with canceller and the name of the function without, as I'm not able to concatenate them in the macro itself. I could probably use `concat_idents` to create both types already defined and reduce the amount of arguments by one, but that macro is nightly only. At the same time, not being able to declare macros inside `impl` forces me to pass `self` as an argument. All this makes this solution more verbose than it would be ideally. It does reduce duplication, but it doesn't reduce the size of the file. [1](https://github.com/rust-lang/rust/issues/29599)
30 lines
1.1 KiB
Rust
30 lines
1.1 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 crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
|
|
use crate::script_thread::MainThreadScriptMsg;
|
|
use crate::task::{TaskCanceller, TaskOnce};
|
|
use crate::task_source::{TaskSource, TaskSourceName};
|
|
use msg::constellation_msg::PipelineId;
|
|
use servo_channel::Sender;
|
|
|
|
#[derive(Clone, JSTraceable)]
|
|
pub struct HistoryTraversalTaskSource(pub Sender<MainThreadScriptMsg>, pub PipelineId);
|
|
|
|
impl TaskSource for HistoryTraversalTaskSource {
|
|
const NAME: TaskSourceName = TaskSourceName::HistoryTraversal;
|
|
|
|
fn queue_with_canceller<T>(&self, task: T, canceller: &TaskCanceller) -> Result<(), ()>
|
|
where
|
|
T: TaskOnce + 'static,
|
|
{
|
|
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
|
|
ScriptThreadEventCategory::HistoryEvent,
|
|
Box::new(canceller.wrap_task(task)),
|
|
Some(self.1),
|
|
HistoryTraversalTaskSource::NAME,
|
|
));
|
|
self.0.send(msg).map_err(|_| ())
|
|
}
|
|
}
|