Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

dom: Silently ignore failures to queue websocket tasks.

Browse source
This commit is contained in:
Josh Matthews 2020-06-19 01:44:37 -04:00
parent 3624a05bd6
commit 2498808d10
4 changed files with 41 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ mod close_code {
pub const TLS_FAILED: u16 = 1015;
}
pub fn close_the_websocket_connection(
fn close_the_websocket_connection(
address: Trusted<WebSocket>,
task_source: &WebsocketTaskSource,
canceller: &TaskCanceller,
@ -81,12 +81,10 @@ pub fn close_the_websocket_connection(
code: code,
reason: Some(reason),
};
task_source
.queue_with_canceller(close_task, &canceller)
.unwrap();
let _ = task_source.queue_with_canceller(close_task, &canceller);
}
pub fn fail_the_websocket_connection(
fn fail_the_websocket_connection(
address: Trusted<WebSocket>,
task_source: &WebsocketTaskSource,
canceller: &TaskCanceller,
@ -97,9 +95,7 @@ pub fn fail_the_websocket_connection(
code: Some(close_code::ABNORMAL),
reason: None,
};
task_source
.queue_with_canceller(close_task, &canceller)
.unwrap();
let _ = task_source.queue_with_canceller(close_task, &canceller);
}
#[dom_struct]
@ -221,18 +217,14 @@ impl WebSocket {
address: address.clone(),
protocol_in_use,
};
task_source
.queue_with_canceller(open_thread, &canceller)
.unwrap();
let _ = task_source.queue_with_canceller(open_thread, &canceller);
},
WebSocketNetworkEvent::MessageReceived(message) => {
let message_thread = MessageReceivedTask {
address: address.clone(),
message: message,
};
task_source
.queue_with_canceller(message_thread, &canceller)
.unwrap();
let _ = task_source.queue_with_canceller(message_thread, &canceller);
},
WebSocketNetworkEvent::Fail => {
fail_the_websocket_connection(address.clone(), &task_source, &canceller);