13 files changed, 15 insertions, 15 deletions
diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs
index 1469db66155..c7800c76239 100644
--- a/components/script/task_source/dom_manipulation.rs
+++ b/components/script/task_source/dom_manipulation.rs
@@ -22,7 +22,7 @@ pub struct DOMManipulationTaskSource(pub Box<dyn ScriptChan + Send>, #[no_trace]
 
 impl Clone for DOMManipulationTaskSource {
     fn clone(&self) -> DOMManipulationTaskSource {
-        DOMManipulationTaskSource(self.0.clone(), self.1)
+        DOMManipulationTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs
index a7ff92e1c85..1f46a41007a 100644
--- a/components/script/task_source/file_reading.rs
+++ b/components/script/task_source/file_reading.rs
@@ -18,7 +18,7 @@ pub struct FileReadingTaskSource(
 
 impl Clone for FileReadingTaskSource {
     fn clone(&self) -> FileReadingTaskSource {
-        FileReadingTaskSource(self.0.clone(), self.1)
+        FileReadingTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/gamepad.rs b/components/script/task_source/gamepad.rs
index 9d38257bace..c0ce2736d6a 100644
--- a/components/script/task_source/gamepad.rs
+++ b/components/script/task_source/gamepad.rs
@@ -19,7 +19,7 @@ pub struct GamepadTaskSource(
 
 impl Clone for GamepadTaskSource {
     fn clone(&self) -> GamepadTaskSource {
-        GamepadTaskSource(self.0.clone(), self.1)
+        GamepadTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/history_traversal.rs b/components/script/task_source/history_traversal.rs
index 4bb90a1ffcb..9eb2daa4dfd 100644
--- a/components/script/task_source/history_traversal.rs
+++ b/components/script/task_source/history_traversal.rs
@@ -5,13 +5,13 @@
 use base::id::PipelineId;
 use crossbeam_channel::Sender;
 
+use crate::messaging::MainThreadScriptMsg;
 use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
-use crate::script_thread::MainThreadScriptMsg;
 use crate::task::{TaskCanceller, TaskOnce};
 use crate::task_source::{TaskSource, TaskSourceName};
 
 #[derive(Clone, JSTraceable)]
-pub struct HistoryTraversalTaskSource(
+pub(crate) struct HistoryTraversalTaskSource(
     #[no_trace] pub Sender<MainThreadScriptMsg>,
     #[no_trace] pub PipelineId,
 );
diff --git a/components/script/task_source/media_element.rs b/components/script/task_source/media_element.rs
index 944ffc4f5bf..f1dfc7f88e7 100644
--- a/components/script/task_source/media_element.rs
+++ b/components/script/task_source/media_element.rs
@@ -14,13 +14,13 @@ use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::event::SimpleEventTask;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::window::Window;
+use crate::messaging::MainThreadScriptMsg;
 use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
-use crate::script_thread::MainThreadScriptMsg;
 use crate::task::{TaskCanceller, TaskOnce};
 use crate::task_source::{TaskSource, TaskSourceName};
 
 #[derive(Clone, JSTraceable)]
-pub struct MediaElementTaskSource(
+pub(crate) struct MediaElementTaskSource(
     #[no_trace] pub Sender<MainThreadScriptMsg>,
     #[no_trace] pub PipelineId,
 );
diff --git a/components/script/task_source/networking.rs b/components/script/task_source/networking.rs
index f142c1f6ae0..1e5f35a1153 100644
--- a/components/script/task_source/networking.rs
+++ b/components/script/task_source/networking.rs
@@ -16,7 +16,7 @@ pub struct NetworkingTaskSource(
 
 impl Clone for NetworkingTaskSource {
     fn clone(&self) -> NetworkingTaskSource {
-        NetworkingTaskSource(self.0.clone(), self.1)
+        NetworkingTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/performance_timeline.rs b/components/script/task_source/performance_timeline.rs
index 9bcfe4bc1d8..d18ceacf663 100644
--- a/components/script/task_source/performance_timeline.rs
+++ b/components/script/task_source/performance_timeline.rs
@@ -25,7 +25,7 @@ pub struct PerformanceTimelineTaskSource(
 
 impl Clone for PerformanceTimelineTaskSource {
     fn clone(&self) -> PerformanceTimelineTaskSource {
-        PerformanceTimelineTaskSource(self.0.clone(), self.1)
+        PerformanceTimelineTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/port_message.rs b/components/script/task_source/port_message.rs
index 0ca613c647c..ebc06489ca1 100644
--- a/components/script/task_source/port_message.rs
+++ b/components/script/task_source/port_message.rs
@@ -18,7 +18,7 @@ pub struct PortMessageQueue(
 
 impl Clone for PortMessageQueue {
     fn clone(&self) -> PortMessageQueue {
-        PortMessageQueue(self.0.clone(), self.1)
+        PortMessageQueue(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/remote_event.rs b/components/script/task_source/remote_event.rs
index 9a70d2a0234..12dbc5321a8 100644
--- a/components/script/task_source/remote_event.rs
+++ b/components/script/task_source/remote_event.rs
@@ -16,7 +16,7 @@ pub struct RemoteEventTaskSource(
 
 impl Clone for RemoteEventTaskSource {
     fn clone(&self) -> RemoteEventTaskSource {
-        RemoteEventTaskSource(self.0.clone(), self.1)
+        RemoteEventTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/rendering.rs b/components/script/task_source/rendering.rs
index 0c652add2bb..d6d0b2a5018 100644
--- a/components/script/task_source/rendering.rs
+++ b/components/script/task_source/rendering.rs
@@ -16,7 +16,7 @@ pub struct RenderingTaskSource(pub Box<dyn ScriptChan + Send>, #[no_trace] pub P
 
 impl Clone for RenderingTaskSource {
     fn clone(&self) -> RenderingTaskSource {
-        RenderingTaskSource(self.0.clone(), self.1)
+        RenderingTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/timer.rs b/components/script/task_source/timer.rs
index 4f8ad10d811..1c274231693 100644
--- a/components/script/task_source/timer.rs
+++ b/components/script/task_source/timer.rs
@@ -19,7 +19,7 @@ pub struct TimerTaskSource(
 
 impl Clone for TimerTaskSource {
     fn clone(&self) -> TimerTaskSource {
-        TimerTaskSource(self.0.clone(), self.1)
+        TimerTaskSource(self.0.as_boxed(), self.1)
     }
 }
 
diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs
index 9ddc06d9185..19ed025fc9a 100644
--- a/components/script/task_source/user_interaction.rs
+++ b/components/script/task_source/user_interaction.rs
@@ -14,8 +14,8 @@ use crate::dom::bindings::refcounted::Trusted;
 use crate::dom::event::{EventBubbles, EventCancelable, EventTask};
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::window::Window;
+use crate::messaging::MainThreadScriptMsg;
 use crate::script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
-use crate::script_thread::MainThreadScriptMsg;
 use crate::task::{TaskCanceller, TaskOnce};
 use crate::task_source::{TaskSource, TaskSourceName};
 
diff --git a/components/script/task_source/websocket.rs b/components/script/task_source/websocket.rs
index 2d05067e28b..2ae11f99eb8 100644
--- a/components/script/task_source/websocket.rs
+++ b/components/script/task_source/websocket.rs
@@ -16,7 +16,7 @@ pub struct WebsocketTaskSource(
 
 impl Clone for WebsocketTaskSource {
     fn clone(&self) -> WebsocketTaskSource {
-        WebsocketTaskSource(self.0.clone(), self.1)
+        WebsocketTaskSource(self.0.as_boxed(), self.1)
     }
 }