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

Auto merge of #7885 - jimberlage:7858/null-message, r=Ms2ger

Browse source 
Creates empty string when passed null

This should fix #7858.  An empty `USVString` is now used when `data` is `None`.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7885)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-09 09:02:45 -06:00
commit 8c81d9ab28
5 changed files with 3 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/webidls/WebSocket.webidl
View file

@ -28,7 +28,7 @@ interface WebSocket : EventTarget {
//messaging
attribute EventHandler onmessage;
attribute BinaryType binaryType;
[Throws] void send(optional USVString data);
[Throws] void send(USVString data);
//void send(Blob data);
//void send(ArrayBuffer data);
//void send(ArrayBufferView data);

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

@ -324,7 +324,7 @@ impl WebSocketMethods for WebSocket {
}
// https://html.spec.whatwg.org/multipage/#dom-websocket-send
fn Send(&self, data: Option<USVString>) -> Fallible<()> {
fn Send(&self, data: USVString) -> Fallible<()> {
match self.ready_state.get() {
WebSocketRequestState::Connecting => {
return Err(Error::InvalidState);
@ -346,7 +346,7 @@ impl WebSocketMethods for WebSocket {
*/
let mut other_sender = self.sender.borrow_mut();
let my_sender = other_sender.as_mut().unwrap();
let _ = my_sender.lock().unwrap().send_message(Message::Text(data.unwrap().0));
let _ = my_sender.lock().unwrap().send_message(Message::Text(data.0));
Ok(())
}