aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorJim Berlage <jberlage@mdsol.com>2015-10-05 19:24:24 -0500
committerJim Berlage <jberlage@mdsol.com>2015-10-08 12:08:26 -0500
commit0ffd2f636f89f5829bc858377de8a1cdf0b6550b (patch)
treed74ab494ba9de64efd5d1a4aadf31a947f444a28 /components/script/dom
parent94816bb3b42e50127db56e64086843b14614ca88 (diff)
downloadservo-0ffd2f636f89f5829bc858377de8a1cdf0b6550b.tar.gz
servo-0ffd2f636f89f5829bc858377de8a1cdf0b6550b.zip
Require the argument to WebSocket#send() (fixes #7858).
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/webidls/WebSocket.webidl2
-rw-r--r--components/script/dom/websocket.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/webidls/WebSocket.webidl b/components/script/dom/webidls/WebSocket.webidl
index 9355b37dde1..e2652a3716f 100644
--- a/components/script/dom/webidls/WebSocket.webidl
+++ b/components/script/dom/webidls/WebSocket.webidl
@@ -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);
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index b90cd53ff06..e58e23051e8 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -256,7 +256,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);
@@ -278,7 +278,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(())
}