diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-18 04:59:32 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-18 04:59:32 +0530 |
commit | 63dc161b773775c6755a604ec04b81c0bc479bf3 (patch) | |
tree | 3c68d0edf0012c441d21d9fd5ebb637eb08887ff /components/script/dom/websocket.rs | |
parent | bc034845b7e543e4e71fa21d6bf99e9f10ddb6c5 (diff) | |
parent | c6dfd7e2fab84fc7d5cb201d855dc6409f985684 (diff) | |
download | servo-63dc161b773775c6755a604ec04b81c0bc479bf3.tar.gz servo-63dc161b773775c6755a604ec04b81c0bc479bf3.zip |
Auto merge of #9683 - kmuszyn:9561-more-thread-source-renamings, r=jdm
Issue #9561 continued - renamed *_thread_source to *_task_source
components/script/dom/bindings/global.rs modified -> all *_thread_source occurrences renamed to *_task_source to comply with spec
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9683)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r-- | components/script/dom/websocket.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 27d7850f4da..438979c2b14 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -238,7 +238,7 @@ impl WebSocket { // Step 7. let ws = WebSocket::new(global, resource_url.clone()); - let address = Trusted::new(ws.r(), global.networking_thread_source()); + let address = Trusted::new(ws.r(), global.networking_task_source()); let connect_data = WebSocketConnectData { resource_url: resource_url.clone(), @@ -265,7 +265,7 @@ impl WebSocket { *ws.sender.borrow_mut() = Some(dom_action_sender); let moved_address = address.clone(); - let sender = global.networking_thread_source(); + let sender = global.networking_task_source(); thread::spawn(move || { while let Ok(event) = dom_event_receiver.recv() { match event { @@ -308,7 +308,7 @@ impl WebSocket { }; let global = self.global(); - let chan = global.r().networking_thread_source(); + let chan = global.r().networking_task_source(); let address = Trusted::new(self, chan.clone()); match data_byte_len.checked_add(self.buffered_amount.get()) { @@ -434,7 +434,7 @@ impl WebSocketMethods for WebSocket { self.ready_state.set(WebSocketRequestState::Closing); let global = self.global(); - let sender = global.r().networking_thread_source(); + let sender = global.r().networking_task_source(); let address = Trusted::new(self, sender.clone()); fail_the_websocket_connection(address, sender); } @@ -468,7 +468,7 @@ impl Runnable for ConnectionEstablishedTask { // Step 1: Protocols. if !self.protocols.is_empty() && self.headers.get::<WebSocketProtocol>().is_none() { - let sender = global.r().networking_thread_source(); + let sender = global.r().networking_task_source(); fail_the_websocket_connection(self.addr, sender); return; } |