Auto merge of #20426 - christianpoveda:issue_20347, r=jdm

Websockets send typed arrays now

<!-- Please describe your changes on the following line: -->

r? jdm

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #20347 (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20426)
<!-- Reviewable:end -->

13 files changed, 32 insertions, 90 deletions

diff --git a/components/script/dom/webidls/WebSocket.webidl b/components/script/dom/webidls/WebSocket.webidl
index b0f36a76657..9dd79421c3f 100644
--- a/components/script/dom/webidls/WebSocket.webidl
+++ b/components/script/dom/webidls/WebSocket.webidl
@@ -30,6 +30,6 @@ interface WebSocket : EventTarget {
     attribute BinaryType binaryType;
     [Throws] void send(USVString data);
     [Throws] void send(Blob data);
-    //void send(ArrayBuffer data);
-    //void send(ArrayBufferView data);
+    [Throws] void send(ArrayBuffer data);
+    [Throws] void send(ArrayBufferView data);
 };
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 6acb82c863c..c072f4bb010 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -24,7 +24,8 @@ use dom_struct::dom_struct;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use js::jsapi::{JSAutoCompartment, JSObject};
 use js::jsval::UndefinedValue;
-use js::typedarray::{ArrayBuffer, CreateWith};
+use js::rust::CustomAutoRooterGuard;
+use js::typedarray::{ArrayBuffer, ArrayBufferView, CreateWith};
 use net_traits::{CoreResourceMsg, FetchChannels};
 use net_traits::{WebSocketDomAction, WebSocketNetworkEvent};
 use net_traits::MessageData;
@@ -350,6 +351,34 @@ impl WebSocketMethods for WebSocket {
         Ok(())
     }
 
+    // https://html.spec.whatwg.org/multipage/#dom-websocket-send
+    fn Send__(&self, array: CustomAutoRooterGuard<ArrayBuffer>) -> ErrorResult {
+        let bytes = array.to_vec();
+        let data_byte_len = bytes.len();
+        let send_data = self.send_impl(data_byte_len as u64)?;
+
+        if send_data {
+            let mut other_sender = self.sender.borrow_mut();
+            let my_sender = other_sender.as_mut().unwrap();
+            let _ = my_sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
+        }
+        Ok(())
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-websocket-send
+    fn Send___(&self, array: CustomAutoRooterGuard<ArrayBufferView>) -> ErrorResult {
+        let bytes = array.to_vec();
+        let data_byte_len = bytes.len();
+        let send_data = self.send_impl(data_byte_len as u64)?;
+
+        if send_data {
+            let mut other_sender = self.sender.borrow_mut();
+            let my_sender = other_sender.as_mut().unwrap();
+            let _ = my_sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
+        }
+        Ok(())
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-websocket-close
     fn Close(&self, code: Option<u16>, reason: Option<USVString>) -> ErrorResult {
         if let Some(code) = code {
diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float32.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float32.htm.ini
deleted file mode 100644
index 36cbfb67c31..00000000000
--- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float32.htm.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Secure-Send-binary-arraybufferview-float32.htm]
-  type: testharness
-  expected: TIMEOUT
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Message should be received]
-    expected: FAIL
-
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be closed]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Send-binary-65K-arraybuffer.htm.ini b/tests/wpt/metadata/websockets/Send-binary-65K-arraybuffer.htm.ini
deleted file mode 100644
index 68e57bfba3c..00000000000
--- a/tests/wpt/metadata/websockets/Send-binary-65K-arraybuffer.htm.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[Send-binary-65K-arraybuffer.htm]
-  type: testharness
-  expected: TIMEOUT
-  [W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be opened]
-    expected: FAIL
-
-  [W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Message should be received]
-    expected: FAIL
-
-  [W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be closed]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Send-binary-arraybuffer.htm.ini b/tests/wpt/metadata/websockets/Send-binary-arraybuffer.htm.ini
deleted file mode 100644
index 7008ffc7f9b..00000000000
--- a/tests/wpt/metadata/websockets/Send-binary-arraybuffer.htm.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[Send-binary-arraybuffer.htm]
-  type: testharness
-  expected: TIMEOUT
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be opened]
-    expected: FAIL
-
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Message should be received]
-    expected: FAIL
-
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be closed]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int16-offset.htm.ini b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int16-offset.htm.ini
deleted file mode 100644
index c10bcee97e6..00000000000
--- a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int16-offset.htm.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Send-binary-arraybufferview-int16-offset.htm]
-  type: testharness
-  expected: TIMEOUT
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Message should be received]
-    expected: FAIL
-
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be closed]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int8.htm.ini b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int8.htm.ini
deleted file mode 100644
index 7fd71d8563a..00000000000
--- a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int8.htm.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Send-binary-arraybufferview-int8.htm]
-  type: testharness
-  expected: TIMEOUT
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Message should be received]
-    expected: FAIL
-
-  [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be closed]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/websockets/binary/001.html.ini b/tests/wpt/metadata/websockets/binary/001.html.ini
index 0aa89984ea5..e951021f33d 100644
--- a/tests/wpt/metadata/websockets/binary/001.html.ini
+++ b/tests/wpt/metadata/websockets/binary/001.html.ini
@@ -1,9 +1,3 @@
-[001.html]
-  type: testharness
-  [WebSockets: Send/Receive blob, blob size less than network array buffer]
-    expected: FAIL
-
-
 [001.html?wss]
   type: testharness
   expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/binary/002.html.ini b/tests/wpt/metadata/websockets/binary/002.html.ini
index 00f7f8f3686..e147562b356 100644
--- a/tests/wpt/metadata/websockets/binary/002.html.ini
+++ b/tests/wpt/metadata/websockets/binary/002.html.ini
@@ -1,9 +1,3 @@
-[002.html]
-  type: testharness
-  [WebSockets: Send/Receive blob, blob size greater than network array buffer]
-    expected: FAIL
-
-
 [002.html?wss]
   type: testharness
   [WebSockets: Send/Receive blob, blob size greater than network array buffer]
diff --git a/tests/wpt/metadata/websockets/binary/004.html.ini b/tests/wpt/metadata/websockets/binary/004.html.ini
index aaae94c55cb..81e00c88a70 100644
--- a/tests/wpt/metadata/websockets/binary/004.html.ini
+++ b/tests/wpt/metadata/websockets/binary/004.html.ini
@@ -1,9 +1,3 @@
-[004.html]
-  type: testharness
-  [WebSockets: Send/Receive ArrayBuffer, size greater than network array buffer]
-    expected: FAIL
-
-
 [004.html?wss]
   type: testharness
   [WebSockets: Send/Receive ArrayBuffer, size greater than network array buffer]
diff --git a/tests/wpt/metadata/websockets/binary/005.html.ini b/tests/wpt/metadata/websockets/binary/005.html.ini
index 6d91fd5a6c8..bf6e162f08d 100644
--- a/tests/wpt/metadata/websockets/binary/005.html.ini
+++ b/tests/wpt/metadata/websockets/binary/005.html.ini
@@ -1,9 +1,3 @@
-[005.html]
-  type: testharness
-  [WebSockets: Send/Receive ArrayBuffer, size less than network array buffer]
-    expected: FAIL
-
-
 [005.html?wss]
   type: testharness
   expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini
index 68489fd3bf1..01192f9a402 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html.ini
@@ -1,9 +1,3 @@
-[bufferedAmount-arraybuffer.html]
-  type: testharness
-  [WebSockets: bufferedAmount for ArrayBuffer]
-    expected: FAIL
-
-
 [bufferedAmount-arraybuffer.html?wss]
   type: testharness
   expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini
index 241d2ab42a3..06242c11870 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html.ini
@@ -1,9 +1,3 @@
-[bufferedAmount-blob.html]
-  type: testharness
-  [WebSockets: bufferedAmount for blob]
-    expected: FAIL
-
-
 [bufferedAmount-blob.html?wss]
   type: testharness
   expected: TIMEOUT