Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +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(())
}

12
tests/wpt/metadata/html/dom/interfaces.html.ini
View file

@ -8733,18 +8733,6 @@
[Location interface: window.location must have own property "reload"]
expected: FAIL
[WebSocket interface: operation send(DOMString)]
expected: FAIL
[WebSocket interface: operation send(Blob)]
expected: FAIL
[WebSocket interface: operation send(ArrayBuffer)]
expected: FAIL
[WebSocket interface: operation send(ArrayBufferView)]
expected: FAIL
[HTMLOptionElement must be primary interface of new Option()]
expected: FAIL

24
tests/wpt/metadata/websockets/interfaces.html.ini
View file

@ -15,18 +15,6 @@
[WebSocket interface: attribute protocol]
expected: FAIL
[WebSocket interface: operation send(DOMString)]
expected: FAIL
[WebSocket interface: operation send(Blob)]
expected: FAIL
[WebSocket interface: operation send(ArrayBuffer)]
expected: FAIL
[WebSocket interface: operation send(ArrayBufferView)]
expected: FAIL
[Stringification of new WebSocket("ws://foo")]
expected: FAIL
@ -39,18 +27,6 @@
[WebSocket interface: new WebSocket("ws://foo") must inherit property "protocol" with the proper type (11)]
expected: FAIL
[WebSocket interface: calling send(DOMString) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
expected: FAIL
[WebSocket interface: calling send(Blob) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
expected: FAIL
[WebSocket interface: calling send(ArrayBuffer) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
expected: FAIL
[WebSocket interface: calling send(ArrayBufferView) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
expected: FAIL
[CloseEvent interface: existence and properties of interface object]
expected: FAIL

5
tests/wpt/metadata/websockets/interfaces/WebSocket/send/001.html.ini
View file

@ -1,5 +0,0 @@
[001.html]
type: testharness
[WebSockets: send() with no args]
expected: FAIL