diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2020-06-19 01:44:37 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2020-06-19 01:45:02 -0400 |
| commit | 2498808d10d7d82f152bdbafeecc2d035bcf1450 (patch) | |
| tree | 2793ae8bafc94cfb2136215d4eeab56afa1955d7 /components/script/dom/websocket.rs | |
| parent | 3624a05bd62d496637ce1ad6aea2980d210e18cb (diff) | |
| download | servo-2498808d10d7d82f152bdbafeecc2d035bcf1450.tar.gz servo-2498808d10d7d82f152bdbafeecc2d035bcf1450.zip | |
dom: Silently ignore failures to queue websocket tasks.
Diffstat (limited to 'components/script/dom/websocket.rs')
| -rw-r--r-- | components/script/dom/websocket.rs | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 89aeda77ebd..2c880d49fee 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -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); |