diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-12 08:08:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-12 08:08:38 -0600 |
| commit | 579ab2d99cd8c07a31c3b68a4659c484d5189ada (patch) | |
| tree | 23f80187ffd746437a86a5ece43775dc64785b4b /components/script/script_thread.rs | |
| parent | 2d0c7166f118efed9f25fbe7b4f01f9521829418 (diff) | |
| parent | a39d1fa7d1b6119f4d86c11cc42728ce22bf1060 (diff) | |
| download | servo-579ab2d99cd8c07a31c3b68a4659c484d5189ada.tar.gz servo-579ab2d99cd8c07a31c3b68a4659c484d5189ada.zip | |
Auto merge of #13774 - KiChjang:event-source-constructor, r=jdm
Finish up the implementation of EventSource
Full implementation of EventSource, complete with closing and reopening streams.
Fixes #8925.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13774)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index cccfbda842d..403dafda0cb 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -659,7 +659,7 @@ impl ScriptThread { chan: MainThreadScriptChan(chan.clone()), dom_manipulation_task_source: DOMManipulationTaskSource(chan.clone()), user_interaction_task_source: UserInteractionTaskSource(chan.clone()), - networking_task_source: NetworkingTaskSource(chan.clone()), + networking_task_source: NetworkingTaskSource(boxed_script_sender.clone()), history_traversal_task_source: HistoryTraversalTaskSource(chan), file_reading_task_source: FileReadingTaskSource(boxed_script_sender), @@ -1623,7 +1623,6 @@ impl ScriptThread { let MainThreadScriptChan(ref sender) = self.chan; let DOMManipulationTaskSource(ref dom_sender) = self.dom_manipulation_task_source; let UserInteractionTaskSource(ref user_sender) = self.user_interaction_task_source; - let NetworkingTaskSource(ref network_sender) = self.networking_task_source; let HistoryTraversalTaskSource(ref history_sender) = self.history_traversal_task_source; let (ipc_timer_event_chan, ipc_timer_event_port) = ipc::channel().unwrap(); @@ -1635,7 +1634,7 @@ impl ScriptThread { MainThreadScriptChan(sender.clone()), DOMManipulationTaskSource(dom_sender.clone()), UserInteractionTaskSource(user_sender.clone()), - NetworkingTaskSource(network_sender.clone()), + self.networking_task_source.clone(), HistoryTraversalTaskSource(history_sender.clone()), self.file_reading_task_source.clone(), self.image_cache_channel.clone(), @@ -2050,7 +2049,7 @@ impl ScriptThread { let (action_sender, action_receiver) = ipc::channel().unwrap(); let listener = NetworkListener { context: context, - script_chan: self.chan.clone(), + task_source: self.networking_task_source.clone(), wrapper: None, }; ROUTER.add_route(action_receiver.to_opaque(), box move |message| { |