aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/websocket.rs
diff options
context:
space:
mode:
authorZhen Zhang <izgzhen@gmail.com>2016-07-05 16:42:07 +0800
committerZhen Zhang <izgzhen@gmail.com>2016-07-05 17:51:53 +0800
commitab14777312b6bc0e21736f907bc22364dea143d3 (patch)
tree9cd66fac8556e87da7b483785a8c8a27de1527ec /components/script/dom/websocket.rs
parent1cba3b3e9835fffbae91ab9dac76ed1f75bcf5c7 (diff)
downloadservo-ab14777312b6bc0e21736f907bc22364dea143d3.tar.gz
servo-ab14777312b6bc0e21736f907bc22364dea143d3.zip
Remove DataSlice, fix #12249
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r--components/script/dom/websocket.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index cc8c6f74d54..1a34096f26b 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -16,7 +16,7 @@ use dom::bindings::js::Root;
use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::{Reflectable, reflect_dom_object};
use dom::bindings::str::{DOMString, USVString, is_token};
-use dom::blob::{Blob, BlobImpl, DataSlice};
+use dom::blob::{Blob, BlobImpl};
use dom::closeevent::CloseEvent;
use dom::event::{Event, EventBubbles, EventCancelable};
use dom::eventtarget::EventTarget;
@@ -405,7 +405,7 @@ impl WebSocketMethods for WebSocket {
if send_data {
let mut other_sender = self.sender.borrow_mut();
let my_sender = other_sender.as_mut().unwrap();
- let bytes = blob.get_slice_or_empty().get_bytes().to_vec();
+ let bytes = blob.get_bytes().unwrap_or(vec![]);
let _ = my_sender.send(WebSocketDomAction::SendMessage(MessageData::Binary(bytes)));
}
@@ -591,8 +591,7 @@ impl Runnable for MessageReceivedTask {
MessageData::Binary(data) => {
match ws.binary_type.get() {
BinaryType::Blob => {
- let slice = DataSlice::from_bytes(data);
- let blob = Blob::new(global.r(), BlobImpl::new_from_slice(slice), "".to_owned());
+ let blob = Blob::new(global.r(), BlobImpl::new_from_bytes(data), "".to_owned());
blob.to_jsval(cx, message.handle_mut());
}
BinaryType::Arraybuffer => {