aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/websocket.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-02-15 07:46:03 -0800
committerGitHub <noreply@github.com>2017-02-15 07:46:03 -0800
commit34fb10bd406cd71cd76840b539faed20b33791a0 (patch)
tree71e294db73ca496f84c08cd20aaba05518f65248 /components/script/dom/websocket.rs
parent4f10a0f2e1ae545649957cc7e305c8cb81312759 (diff)
parent67c572af37ac6dd170414b3dfc34dfdf21da8015 (diff)
downloadservo-34fb10bd406cd71cd76840b539faed20b33791a0.tar.gz
servo-34fb10bd406cd71cd76840b539faed20b33791a0.zip
Auto merge of #15563 - servo:update-js, r=nox
Update js. Fixes #15553. <!-- 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/15563) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r--components/script/dom/websocket.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 8a25a458530..7c02123f33d 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -27,7 +27,7 @@ use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use js::jsapi::JSAutoCompartment;
use js::jsval::UndefinedValue;
-use js::typedarray::ArrayBuffer;
+use js::typedarray::{ArrayBuffer, CreateWith};
use net_traits::{WebSocketCommunicate, WebSocketConnectData, WebSocketDomAction, WebSocketNetworkEvent};
use net_traits::CookieSource::HTTP;
use net_traits::CoreResourceMsg::{SetCookiesForUrl, WebsocketConnect};
@@ -609,8 +609,7 @@ impl Runnable for MessageReceivedTask {
BinaryType::Arraybuffer => {
rooted!(in(cx) let mut array_buffer = ptr::null_mut());
assert!(ArrayBuffer::create(cx,
- data.len() as u32,
- Some(data.as_slice()),
+ CreateWith::Slice(&data),
array_buffer.handle_mut())
.is_ok());