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

refactor(websocket): do not borrow sender anymore

Browse source
This commit is contained in:
OJ Kwon 2018-03-26 08:54:19 -07:00
parent 0948adf370
commit a1316fae0a
No known key found for this signature in database
GPG key ID: 6C23A45602A44DA6
1 changed files with 13 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,27 +106,27 @@ pub struct WebSocket {
buffered_amount: Cell<u64>, buffered_amount: Cell<u64>,
clearing_buffer: Cell<bool>, //Flag to tell if there is a running thread to clear buffered_amount clearing_buffer: Cell<bool>, //Flag to tell if there is a running thread to clear buffered_amount
#[ignore_malloc_size_of = "Defined in std"] #[ignore_malloc_size_of = "Defined in std"]
sender: DomRefCell<Option<IpcSender<WebSocketDomAction>>>, sender: IpcSender<WebSocketDomAction>,
binary_type: Cell<BinaryType>, binary_type: Cell<BinaryType>,
protocol: DomRefCell<String>, //Subprotocol selected by server protocol: DomRefCell<String>, //Subprotocol selected by server
} }
impl WebSocket { impl WebSocket {
fn new_inherited(url: ServoUrl) -> WebSocket { fn new_inherited(url: ServoUrl, sender: IpcSender<WebSocketDomAction>) -> WebSocket {
WebSocket { WebSocket {
eventtarget: EventTarget::new_inherited(), eventtarget: EventTarget::new_inherited(),
url: url, url: url,
ready_state: Cell::new(WebSocketRequestState::Connecting), ready_state: Cell::new(WebSocketRequestState::Connecting),
buffered_amount: Cell::new(0), buffered_amount: Cell::new(0),
clearing_buffer: Cell::new(false), clearing_buffer: Cell::new(false),
sender: DomRefCell::new(None), sender: sender,
binary_type: Cell::new(BinaryType::Blob), binary_type: Cell::new(BinaryType::Blob),
protocol: DomRefCell::new("".to_owned()), protocol: DomRefCell::new("".to_owned()),
} }
} }
fn new(global: &GlobalScope, url: ServoUrl) -> DomRoot<WebSocket> { fn new(global: &GlobalScope, url: ServoUrl, sender: IpcSender<WebSocketDomAction>) -> DomRoot<WebSocket> {
reflect_dom_object(Box::new(WebSocket::new_inherited(url)), reflect_dom_object(Box::new(WebSocket::new_inherited(url, sender)),
global, WebSocketBinding::Wrap) global, WebSocketBinding::Wrap)
} }
@ -174,9 +174,6 @@ impl WebSocket {
} }
} }
let ws = WebSocket::new(global, url_record.clone());
let address = Trusted::new(&*ws);
// Create the interface for communication with the resource thread // Create the interface for communication with the resource thread
let (dom_action_sender, resource_action_receiver): let (dom_action_sender, resource_action_receiver):
(IpcSender<WebSocketDomAction>, (IpcSender<WebSocketDomAction>,
@ -186,6 +183,9 @@ impl WebSocket {
ProfiledIpc::IpcReceiver<WebSocketNetworkEvent>) = ProfiledIpc::IpcReceiver<WebSocketNetworkEvent>) =
ProfiledIpc::channel(global.time_profiler_chan().clone()).unwrap(); ProfiledIpc::channel(global.time_profiler_chan().clone()).unwrap();
let ws = WebSocket::new(global, url_record.clone(), dom_action_sender);
let address = Trusted::new(&*ws);
// Step 8. // Step 8.
let request = RequestInit { let request = RequestInit {
url: url_record, url: url_record,
@ -199,8 +199,6 @@ impl WebSocket {
}; };
let _ = global.core_resource_thread().send(CoreResourceMsg::Fetch(request, channels)); let _ = global.core_resource_thread().send(CoreResourceMsg::Fetch(request, channels));
*ws.sender.borrow_mut() = Some(dom_action_sender);
let task_source = global.networking_task_source(); let task_source = global.networking_task_source();
let canceller = global.task_canceller(); let canceller = global.task_canceller();
thread::spawn(move || { thread::spawn(move || {
@ -324,9 +322,7 @@ impl WebSocketMethods for WebSocket {
let send_data = self.send_impl(data_byte_len)?; let send_data = self.send_impl(data_byte_len)?;
if send_data { if send_data {
let mut other_sender = self.sender.borrow_mut(); let _ = self.sender.send(WebSocketDomAction::SendMessage(MessageData::Text(data.0)));
let my_sender = other_sender.as_mut().unwrap();
let _ = my_sender.send(WebSocketDomAction::SendMessage(MessageData::Text(data.0)));
} }
Ok(()) Ok(())
@ -342,10 +338,8 @@ impl WebSocketMethods for WebSocket {
let send_data = self.send_impl(data_byte_len)?; let send_data = self.send_impl(data_byte_len)?;
if send_data { if send_data {
let mut other_sender = self.sender.borrow_mut();
let my_sender = other_sender.as_mut().unwrap();
let bytes = blob.get_bytes().unwrap_or(vec![]); let bytes = blob.get_bytes().unwrap_or(vec![]);
let _ = my_sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes))); let _ = self.sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
} }
Ok(()) Ok(())
@ -358,9 +352,7 @@ impl WebSocketMethods for WebSocket {
let send_data = self.send_impl(data_byte_len as u64)?; let send_data = self.send_impl(data_byte_len as u64)?;
if send_data { if send_data {
let mut other_sender = self.sender.borrow_mut(); let _ = self.sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
let my_sender = other_sender.as_mut().unwrap();
let _ = my_sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
} }
Ok(()) Ok(())
} }
@ -372,9 +364,7 @@ impl WebSocketMethods for WebSocket {
let send_data = self.send_impl(data_byte_len as u64)?; let send_data = self.send_impl(data_byte_len as u64)?;
if send_data { if send_data {
let mut other_sender = self.sender.borrow_mut(); let _ = self.sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
let my_sender = other_sender.as_mut().unwrap();
let _ = my_sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
} }
Ok(()) Ok(())
} }
@ -410,9 +400,7 @@ impl WebSocketMethods for WebSocket {
// Kick off _Start the WebSocket Closing Handshake_ // Kick off _Start the WebSocket Closing Handshake_
// https://tools.ietf.org/html/rfc6455#section-7.1.2 // https://tools.ietf.org/html/rfc6455#section-7.1.2
let reason = reason.map(|reason| reason.0); let reason = reason.map(|reason| reason.0);
let mut other_sender = self.sender.borrow_mut(); let _ = self.sender.send(WebSocketDomAction::Close(code, reason));
let my_sender = other_sender.as_mut().unwrap();
let _ = my_sender.send(WebSocketDomAction::Close(code, reason));
} }
} }
Ok(()) //Return Ok Ok(()) //Return Ok