aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-06-26 21:20:13 +0200
committerMs2ger <ms2ger@gmail.com>2015-06-26 21:20:13 +0200
commita72c6ec8b60541ee6f8661e96807ee79902ae000 (patch)
treeccf21cf77940a9a00a28059374718616b372c46c /components/script/dom/webglrenderingcontext.rs
parentef97879c273e9eed3b4dece07813c2d4e6eb2c38 (diff)
downloadservo-a72c6ec8b60541ee6f8661e96807ee79902ae000.tar.gz
servo-a72c6ec8b60541ee6f8661e96807ee79902ae000.zip
Stop using Vec::from_raw_buf.
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs15
1 files changed, 7 insertions, 8 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index d6d2c5b6144..766c61fa57c 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -25,6 +25,7 @@ use js::jsapi::{JS_GetFloat32ArrayData, JS_GetObjectAsArrayBufferView};
use js::jsval::{JSVal, UndefinedValue, NullValue, Int32Value};
use std::mem;
use std::ptr;
+use std::slice;
use std::sync::mpsc::{channel, Sender};
use util::str::DOMString;
use offscreen_gl_context::GLContextAttributes;
@@ -219,8 +220,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
Some(data) => data,
None => return,
};
- let data_vec;
- unsafe {
+ let data_vec = unsafe {
let mut length = 0;
let mut ptr = ptr::null_mut();
let buffer_data = JS_GetObjectAsArrayBufferView(data, &mut length, &mut ptr);
@@ -229,8 +229,8 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
}
let data_f32 = JS_GetFloat32ArrayData(buffer_data, ptr::null());
let data_vec_length = length / mem::size_of::<f32>() as u32;
- data_vec = Vec::from_raw_buf(data_f32, data_vec_length as usize);
- }
+ slice::from_raw_parts(data_f32, data_vec_length as usize).to_vec()
+ };
self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BufferData(target, data_vec, usage))).unwrap()
}
@@ -437,11 +437,10 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
None => return,
};
- let data_vec: Vec<f32>;
- unsafe {
+ let data_vec = unsafe {
let data_f32 = JS_GetFloat32ArrayData(data, ptr::null());
- data_vec = Vec::from_raw_buf(data_f32, 4);
- }
+ slice::from_raw_parts(data_f32, 4).to_vec()
+ };
self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::Uniform4fv(uniform_id, data_vec))).unwrap()
}