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

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 -->

1 files changed, 2 insertions, 2 deletions

diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 228b8ac92c4..a04b64ded41 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -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(())
     }