aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/websocket.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-10-04 00:46:27 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-10-06 21:35:49 +0200
commit1fd470889dd9b4e6c3a871b6b40b50e30114443d (patch)
treecc6162aff3823b8e3b676ce6a1cad5f1904da77c /components/script/dom/websocket.rs
parenta7305b7fc4e4b9c70e9a5ef43f66a7b6be6731ec (diff)
downloadservo-1fd470889dd9b4e6c3a871b6b40b50e30114443d.tar.gz
servo-1fd470889dd9b4e6c3a871b6b40b50e30114443d.zip
Introduce GlobalScope::networking_task_source
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r--components/script/dom/websocket.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index ac1cf53b2ae..242f8124721 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -270,7 +270,7 @@ impl WebSocket {
*ws.sender.borrow_mut() = Some(dom_action_sender);
let moved_address = address.clone();
- let sender = global.networking_task_source();
+ let sender = global_scope.networking_task_source();
thread::spawn(move || {
while let Ok(event) = dom_event_receiver.recv() {
match event {
@@ -438,7 +438,7 @@ impl WebSocketMethods for WebSocket {
self.ready_state.set(WebSocketRequestState::Closing);
let address = Trusted::new(self);
- let sender = self.global().r().networking_task_source();
+ let sender = self.global_scope().networking_task_source();
fail_the_websocket_connection(address, sender);
}
WebSocketRequestState::Open => {
@@ -469,11 +469,10 @@ impl Runnable for ConnectionEstablishedTask {
fn handler(self: Box<Self>) {
let ws = self.address.root();
- let global = ws.r().global();
// Step 1: Protocols.
if !self.protocols.is_empty() && self.headers.get::<WebSocketProtocol>().is_none() {
- let sender = global.r().networking_task_source();
+ let sender = ws.global_scope().networking_task_source();
fail_the_websocket_connection(self.address, sender);
return;
}