diff options
Diffstat (limited to 'components/script/task_source')
-rw-r--r-- | components/script/task_source/dom_manipulation.rs | 5 | ||||
-rw-r--r-- | components/script/task_source/file_reading.rs | 1 | ||||
-rw-r--r-- | components/script/task_source/mod.rs | 2 | ||||
-rw-r--r-- | components/script/task_source/networking.rs | 2 | ||||
-rw-r--r-- | components/script/task_source/performance_timeline.rs | 3 | ||||
-rw-r--r-- | components/script/task_source/remote_event.rs | 1 | ||||
-rw-r--r-- | components/script/task_source/user_interaction.rs | 3 |
7 files changed, 12 insertions, 5 deletions
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs index 03b2d85a945..f184aa3d828 100644 --- a/components/script/task_source/dom_manipulation.rs +++ b/components/script/task_source/dom_manipulation.rs @@ -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(|_| ()) } diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs index 8fd3a143eff..f8ca38a0c30 100644 --- a/components/script/task_source/file_reading.rs +++ b/components/script/task_source/file_reading.rs @@ -34,6 +34,7 @@ impl TaskSource for FileReadingTaskSource { ScriptThreadEventCategory::FileRead, Box::new(canceller.wrap_task(task)), Some(self.1), + FileReadingTaskSource::NAME, )) } } diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs index 23fb3e9ca8f..b64f4b2b991 100644 --- a/components/script/task_source/mod.rs +++ b/components/script/task_source/mod.rs @@ -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, diff --git a/components/script/task_source/networking.rs b/components/script/task_source/networking.rs index 9058f9653e4..9ecbea9c80d 100644 --- a/components/script/task_source/networking.rs +++ b/components/script/task_source/networking.rs @@ -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, )) } } diff --git a/components/script/task_source/performance_timeline.rs b/components/script/task_source/performance_timeline.rs index 05591bbe71b..6191db7600a 100644 --- a/components/script/task_source/performance_timeline.rs +++ b/components/script/task_source/performance_timeline.rs @@ -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(|_| ()) } diff --git a/components/script/task_source/remote_event.rs b/components/script/task_source/remote_event.rs index 2d8428cddbf..97e33977e6f 100644 --- a/components/script/task_source/remote_event.rs +++ b/components/script/task_source/remote_event.rs @@ -31,6 +31,7 @@ impl TaskSource for RemoteEventTaskSource { ScriptThreadEventCategory::NetworkEvent, Box::new(canceller.wrap_task(task)), Some(self.1), + RemoteEventTaskSource::NAME, )) } } diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs index 2ace44f1093..2beaee95731 100644 --- a/components/script/task_source/user_interaction.rs +++ b/components/script/task_source/user_interaction.rs @@ -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(|_| ()) } |