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

Fixed definition of Close and Send in WebSocket.webidl and updated implementation in websocket.rs.

Browse source
This commit is contained in:
Paul Faria 2015-05-16 14:10:10 -04:00
parent c51e9f0455
commit 66e9b33a52
5 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,13 +21,13 @@ interface WebSocket : EventTarget {
attribute EventHandler onclose;
//readonly attribute DOMString extensions;
//readonly attribute DOMString protocol;
//[Throws] void close([Clamp] optional unsigned short code, optional DOMString reason); //Clamp doesn't work
[Throws] void close(optional unsigned short code, optional DOMString reason); //No clamp version - works
//[Throws] void close([Clamp] optional unsigned short code, optional USVString reason); //Clamp doesn't work
[Throws] void close(optional unsigned short code, optional USVString reason); //No clamp version - works
//messaging
//attribute EventHandler onmessage;
//attribute BinaryType binaryType;
[Throws] void send(optional DOMString data);
[Throws] void send(optional USVString data);
//void send(Blob data);
//void send(ArrayBuffer data);
//void send(ArrayBufferView data);

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

@ -14,6 +14,7 @@ use dom::bindings::error::Error::Syntax;
use dom::bindings::global::{GlobalField, GlobalRef};
use dom::bindings::js::{Temporary, JSRef, Rootable};
use dom::bindings::refcounted::Trusted;
use dom::bindings::str::USVString;
use dom::bindings::trace::JSTraceable;
use dom::bindings::utils::reflect_dom_object;
use dom::closeevent::CloseEvent;
@ -153,7 +154,7 @@ impl<'a> WebSocketMethods for JSRef<'a, WebSocket> {
self.ready_state.get() as u16
}
fn Send(self, data: Option<DOMString>)-> Fallible<()>{
fn Send(self, data: Option<USVString>)-> Fallible<()>{
/*TODO: This is not up to spec see http://html.spec.whatwg.org/multipage/comms.html search for "If argument is a string"
TODO: Need to buffer data
TODO: bufferedAmount attribute returns the size of the buffer in bytes -
@ -168,11 +169,11 @@ impl<'a> WebSocketMethods for JSRef<'a, WebSocket> {
let _ = my_sender.send_message(Message::Close(None));
return Ok(());
}
let _ = my_sender.send_message(Message::Text(data.unwrap()));
let _ = my_sender.send_message(Message::Text(data.unwrap().0));
return Ok(())
}
fn Close(self, code: Option<u16>, reason: Option<DOMString>) -> Fallible<()>{
fn Close(self, code: Option<u16>, reason: Option<USVString>) -> Fallible<()>{
if let Some(code) = code {
//Check code is NOT 1000 NOR in the range of 3000-4999 (inclusive)
if code != 1000 && (code < 3000 || code > 4999) {
@ -180,7 +181,7 @@ impl<'a> WebSocketMethods for JSRef<'a, WebSocket> {
}
}
if let Some(ref reason) = reason {
if reason.as_bytes().len() > 123 { //reason cannot be larger than 123 bytes
if reason.0.as_bytes().len() > 123 { //reason cannot be larger than 123 bytes
return Err(Error::Syntax);
}
}
@ -205,7 +206,7 @@ impl<'a> WebSocketMethods for JSRef<'a, WebSocket> {
self.code.set(code);
}
if let Some(reason) = reason {
*self.reason.borrow_mut() = reason;
*self.reason.borrow_mut() = reason.0;
}
self.ready_state.set(WebSocketRequestState::Closing);
self.sendCloseFrame.set(true);