Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add the TaskSourceName to CommonScriptMsg::Task

Browse source 
Update QueuedTaskConversion and the TaskQueue to use it
This commit is contained in:
Agustin Chiappe Berrini 2018-09-02 08:18:22 -04:00 • committed by AgustinCB
parent b211e45bb0
commit e286fdcc53
18 changed files with 134 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/task_source/dom_manipulation.rs
View file

@ -27,7 +27,7 @@ impl fmt::Debug for DOMManipulationTaskSource {
}
impl TaskSource for DOMManipulationTaskSource {
const NAME: TaskSourceName = TaskSourceName::DOMManipulation;
const NAME: TaskSourceName = TaskSourceName::DOMManipulation;
fn queue_with_canceller<T>(
&self,
@ -40,7 +40,8 @@ impl TaskSource for DOMManipulationTaskSource {
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
ScriptThreadEventCategory::ScriptEvent,
Box::new(canceller.wrap_task(task)),
Some(self.1)
Some(self.1),
DOMManipulationTaskSource::NAME,
));
self.0.send(msg).map_err(|_| ())
}

1
components/script/task_source/file_reading.rs
View file

@ -34,6 +34,7 @@ impl TaskSource for FileReadingTaskSource {
ScriptThreadEventCategory::FileRead,
Box::new(canceller.wrap_task(task)),
Some(self.1),
FileReadingTaskSource::NAME,
))
}
}

2
components/script/task_source/mod.rs
View file

@ -20,7 +20,7 @@ use task::{TaskCanceller, TaskOnce};
// Note: When adding a task source, update this enum.
// Note: The HistoryTraversalTaskSource is not part of this,
// because it doesn't implement TaskSource.
#[derive(Eq, Hash, IntoEnumIterator, JSTraceable, PartialEq)]
#[derive(Clone, Eq, Hash, IntoEnumIterator, JSTraceable, PartialEq)]
pub enum TaskSourceName {
DOMManipulation,
FileReading,

2
components/script/task_source/networking.rs
View file

@ -31,6 +31,7 @@ impl TaskSource for NetworkingTaskSource {
ScriptThreadEventCategory::NetworkEvent,
Box::new(canceller.wrap_task(task)),
Some(self.1),
NetworkingTaskSource::NAME,
))
}
}
@ -46,6 +47,7 @@ impl NetworkingTaskSource {
ScriptThreadEventCategory::NetworkEvent,
Box::new(task),
Some(self.1),
NetworkingTaskSource::NAME,
))
}
}

3
components/script/task_source/performance_timeline.rs
View file

@ -44,7 +44,8 @@ impl TaskSource for PerformanceTimelineTaskSource {
let msg = CommonScriptMsg::Task(
ScriptThreadEventCategory::PerformanceTimelineTask,
Box::new(canceller.wrap_task(task)),
Some(self.1)
Some(self.1),
PerformanceTimelineTaskSource::NAME,
);
self.0.send(msg).map_err(|_| ())
}

1
components/script/task_source/remote_event.rs
View file

@ -31,6 +31,7 @@ impl TaskSource for RemoteEventTaskSource {
ScriptThreadEventCategory::NetworkEvent,
Box::new(canceller.wrap_task(task)),
Some(self.1),
RemoteEventTaskSource::NAME,
))
}
}

3
components/script/task_source/user_interaction.rs
View file

@ -40,7 +40,8 @@ impl TaskSource for UserInteractionTaskSource {
let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
ScriptThreadEventCategory::InputEvent,
Box::new(canceller.wrap_task(task)),
Some(self.1)
Some(self.1),
UserInteractionTaskSource::NAME,
));
self.0.send(msg).map_err(|_| ())
}