Auto merge of #7214 - tomjakubowski:websocket-binaryType, r=Ms2ger

Implement WebSocket#binaryType

Closes #7098

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7214)
<!-- Reviewable:end -->

components/script/dom/webidls/WebSocket.webidl

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

components/script/dom/websocket.rs

@@ -4,7 +4,7 @@
 
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::WebSocketBinding;
-use dom::bindings::codegen::Bindings::WebSocketBinding::WebSocketMethods;
+use dom::bindings::codegen::Bindings::WebSocketBinding::{BinaryType, WebSocketMethods};
 use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
 use dom::bindings::codegen::InheritTypes::EventTargetCast;
 use dom::bindings::codegen::InheritTypes::EventCast;
@@ -29,8 +29,10 @@ use util::str::DOMString;
 use util::task::spawn_named;
 
 use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment};
+use js::jsapi::{JS_NewArrayBuffer, JS_GetArrayBufferData};
 use js::jsval::UndefinedValue;
 use hyper::header::Host;
+use libc::{uint8_t, uint32_t};
 use websocket::Message;
 use websocket::ws::sender::Sender as Sender_Object;
 use websocket::client::sender::Sender;
@@ -45,6 +47,7 @@ use websocket::ws::util::url::parse_url;
 
 use std::borrow::ToOwned;
 use std::cell::{Cell, RefCell};
+use std::ptr;
 use std::sync::{Arc, Mutex};
 
 #[derive(JSTraceable, PartialEq, Copy, Clone, Debug, HeapSizeOf)]
@@ -78,6 +81,7 @@ pub struct WebSocket {
     code: Cell<u16>, //Closing code
     reason: DOMRefCell<DOMString>, //Closing reason
     data: DOMRefCell<DOMString>, //Data from send - TODO: Remove after buffer is added.
+    binary_type: Cell<BinaryType>,
 }
 
 /// *Establish a WebSocket Connection* as defined in RFC 6455.
@@ -117,6 +121,7 @@ impl WebSocket {
             code: Cell::new(0),
             reason: DOMRefCell::new("".to_owned()),
             data: DOMRefCell::new("".to_owned()),
+            binary_type: Cell::new(BinaryType::Blob),
         }
 
     }
@@ -238,6 +243,16 @@ impl<'a> WebSocketMethods for &'a WebSocket {
         self.ready_state.get() as u16
     }
 
+    // https://html.spec.whatwg.org/multipage/#dom-websocket-binarytype
+    fn BinaryType(self) -> BinaryType {
+        self.binary_type.get()
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-websocket-binarytype
+    fn SetBinaryType(self, btype: BinaryType) {
+        self.binary_type.set(btype)
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-websocket-send
     fn Send(self, data: Option<USVString>) -> Fallible<()> {
         match self.ready_state.get() {
@@ -396,6 +411,7 @@ struct MessageReceivedTask {
 }
 
 impl Runnable for MessageReceivedTask {
+    #[allow(unsafe_code)]
     fn handler(self: Box<Self>) {
         let ws = self.address.root();
         debug!("MessageReceivedTask::handler({:p}): readyState={:?}", &*ws,
@@ -415,8 +431,22 @@ impl Runnable for MessageReceivedTask {
         match self.message {
             MessageData::Text(text) => text.to_jsval(cx, message.handle_mut()),
             MessageData::Binary(data) => {
-                let blob = Blob::new(global.r(), Some(data), "");
-                blob.to_jsval(cx, message.handle_mut());
+                match ws.binary_type.get() {
+                    BinaryType::Blob => {
+                        let blob = Blob::new(global.r(), Some(data), "");
+                        blob.to_jsval(cx, message.handle_mut());
+                    }
+                    BinaryType::Arraybuffer => {
+                        unsafe {
+                            let len = data.len() as uint32_t;
+                            let buf = JS_NewArrayBuffer(cx, len);
+                            let buf_data: *mut uint8_t = JS_GetArrayBufferData(buf, ptr::null());
+                            ptr::copy_nonoverlapping(data.as_ptr(), buf_data, len as usize);
+                            buf.to_jsval(cx, message.handle_mut());
+                        }
+                    }
+
+                }
             },
         }
 

tests/wpt/metadata/html/dom/interfaces.html.ini

@@ -8298,9 +8298,6 @@
   [WebSocket interface: attribute protocol]
     expected: FAIL
 
-  [WebSocket interface: attribute binaryType]
-    expected: FAIL
-
   [CloseEvent interface: existence and properties of interface object]
     expected: FAIL
 
@@ -8981,4 +8978,3 @@
 
   [HTMLOptionElement interface: new Option() must inherit property "index" with the proper type (7)]
     expected: FAIL
-

tests/wpt/metadata/websockets/interfaces.html.ini

@@ -15,9 +15,6 @@
   [WebSocket interface: attribute protocol]
     expected: FAIL
 
-  [WebSocket interface: attribute binaryType]
-    expected: FAIL
-
   [WebSocket interface: operation send(DOMString)]
     expected: FAIL
 
@@ -42,9 +39,6 @@
   [WebSocket interface: new WebSocket("ws://foo") must inherit property "protocol" with the proper type (11)]
     expected: FAIL
 
-  [WebSocket interface: new WebSocket("ws://foo") must inherit property "binaryType" with the proper type (14)]
-    expected: FAIL
-
   [WebSocket interface: calling send(DOMString) on new WebSocket("ws://foo") with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -62,4 +56,3 @@
 
   [CloseEvent interface: existence and properties of interface prototype object]
     expected: FAIL
-