Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rewrote websocket array buffer handling to typed array API

Browse source
This commit is contained in:
Sumant Manne 2016-12-23 06:47:25 -06:00
parent dd2aa4195a
commit 4623b5f76b
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,10 +25,9 @@ use dom::urlhelper::UrlHelper;
use hyper; use hyper;
use hyper_serde::Serde; use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use js::jsapi::{JS_GetArrayBufferData, JS_NewArrayBuffer};
use js::jsapi::JSAutoCompartment; use js::jsapi::JSAutoCompartment;
use js::jsval::UndefinedValue; use js::jsval::UndefinedValue;
use libc::{uint32_t, uint8_t}; use js::typedarray::ArrayBuffer;
use net_traits::{WebSocketCommunicate, WebSocketConnectData, WebSocketDomAction, WebSocketNetworkEvent}; use net_traits::{WebSocketCommunicate, WebSocketConnectData, WebSocketDomAction, WebSocketNetworkEvent};
use net_traits::CookieSource::HTTP; use net_traits::CookieSource::HTTP;
use net_traits::CoreResourceMsg::{SetCookiesForUrl, WebsocketConnect}; use net_traits::CoreResourceMsg::{SetCookiesForUrl, WebsocketConnect};
@ -608,13 +607,14 @@ impl Runnable for MessageReceivedTask {
blob.to_jsval(cx, message.handle_mut()); blob.to_jsval(cx, message.handle_mut());
} }
BinaryType::Arraybuffer => { BinaryType::Arraybuffer => {
let len = data.len() as uint32_t; rooted!(in(cx) let mut array_buffer = ptr::null_mut());
let buf = JS_NewArrayBuffer(cx, len); assert!(ArrayBuffer::create(cx,
let mut is_shared = false; data.len() as u32,
let buf_data: *mut uint8_t = JS_GetArrayBufferData(buf, &mut is_shared, ptr::null()); Some(data.as_slice()),
assert!(!is_shared); array_buffer.handle_mut())
ptr::copy_nonoverlapping(data.as_ptr(), buf_data, len as usize); .is_ok());
buf.to_jsval(cx, message.handle_mut());
(*array_buffer).to_jsval(cx, message.handle_mut());
} }
} }