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

Avoid a useless clone in WebSocket::Constructor

Browse source
This commit is contained in:
Anthony Ramine 2017-03-23 14:17:17 +01:00
parent 301ba366b8
commit 9894dca86c
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -274,7 +274,6 @@ impl WebSocket {
*ws.sender.borrow_mut() = Some(dom_action_sender); *ws.sender.borrow_mut() = Some(dom_action_sender);
let moved_address = address.clone();
let task_source = global.networking_task_source(); let task_source = global.networking_task_source();
let wrapper = global.get_runnable_wrapper(); let wrapper = global.get_runnable_wrapper();
thread::spawn(move || { thread::spawn(move || {
@ -282,7 +281,7 @@ impl WebSocket {
match event { match event {
WebSocketNetworkEvent::ConnectionEstablished(headers, protocols) => { WebSocketNetworkEvent::ConnectionEstablished(headers, protocols) => {
let open_thread = box ConnectionEstablishedTask { let open_thread = box ConnectionEstablishedTask {
address: moved_address.clone(), address: address.clone(),
headers: headers, headers: headers,
protocols: protocols, protocols: protocols,
}; };
@ -290,22 +289,23 @@ impl WebSocket {
}, },
WebSocketNetworkEvent::MessageReceived(message) => { WebSocketNetworkEvent::MessageReceived(message) => {
let message_thread = box MessageReceivedTask { let message_thread = box MessageReceivedTask {
address: moved_address.clone(), address: address.clone(),
message: message, message: message,
}; };
task_source.queue_with_wrapper(message_thread, &wrapper).unwrap(); task_source.queue_with_wrapper(message_thread, &wrapper).unwrap();
}, },
WebSocketNetworkEvent::Fail => { WebSocketNetworkEvent::Fail => {
fail_the_websocket_connection(moved_address.clone(), fail_the_websocket_connection(address.clone(),
&task_source, &wrapper); &task_source, &wrapper);
}, },
WebSocketNetworkEvent::Close(code, reason) => { WebSocketNetworkEvent::Close(code, reason) => {
close_the_websocket_connection(moved_address.clone(), close_the_websocket_connection(address.clone(),
&task_source, &wrapper, code, reason); &task_source, &wrapper, code, reason);
}, },
} }
} }
}); });
// Step 7. // Step 7.
Ok(ws) Ok(ws)
} }