Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Introduce GlobalScope::networking_task_source

Browse source
This commit is contained in:
Anthony Ramine 2016-10-04 00:46:27 +02:00
parent a7305b7fc4
commit 1fd470889d
5 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/websocket.rs
View file

@ -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;
}