diff options
author | Emilio Cobos Álvarez <ecoal95@gmail.com> | 2016-01-04 15:51:01 +0100 |
---|---|---|
committer | Emilio Cobos Álvarez <ecoal95@gmail.com> | 2016-01-04 15:51:01 +0100 |
commit | d30f05554b981ae564293234c55ad43bc2df8134 (patch) | |
tree | 88ba32c9343434b5ebd3ae455795ba7f1ef29498 /components/script/dom/webglrenderingcontext.rs | |
parent | 43d395a682c1b03497e4869744b4b25e92906cc6 (diff) | |
download | servo-d30f05554b981ae564293234c55ad43bc2df8134.tar.gz servo-d30f05554b981ae564293234c55ad43bc2df8134.zip |
conversions: Make a `is_type_compatible` method for ArrayBufferViews.
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 43fb4d1d325..6b6c310bcf0 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -28,7 +28,7 @@ use dom::webgltexture::{TexParameterValue, WebGLTexture}; use dom::webgluniformlocation::WebGLUniformLocation; use euclid::size::Size2D; use ipc_channel::ipc::{self, IpcSender}; -use js::jsapi::{JSContext, JSObject, RootedValue, Type}; +use js::jsapi::{JSContext, JSObject, RootedValue}; use js::jsval::{BooleanValue, DoubleValue, Int32Value, JSVal, NullValue, UndefinedValue}; use net_traits::image::base::PixelFormat; use net_traits::image_cache_task::ImageResponse; @@ -948,7 +948,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { None => return, }; - if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data, Type::Float32) { + if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data) { if data_vec.len() < 4 { return self.webgl_error(InvalidOperation); } @@ -976,7 +976,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 fn VertexAttrib1fv(&self, _cx: *mut JSContext, indx: u32, data: *mut JSObject) { - if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data, Type::Float32) { + if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data) { if data_vec.len() < 4 { return self.webgl_error(InvalidOperation); } @@ -994,7 +994,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 fn VertexAttrib2fv(&self, _cx: *mut JSContext, indx: u32, data: *mut JSObject) { - if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data, Type::Float32) { + if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data) { if data_vec.len() < 2 { return self.webgl_error(InvalidOperation); } @@ -1012,7 +1012,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 fn VertexAttrib3fv(&self, _cx: *mut JSContext, indx: u32, data: *mut JSObject) { - if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data, Type::Float32) { + if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data) { if data_vec.len() < 3 { return self.webgl_error(InvalidOperation); } @@ -1029,7 +1029,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 fn VertexAttrib4fv(&self, _cx: *mut JSContext, indx: u32, data: *mut JSObject) { - if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data, Type::Float32) { + if let Some(data_vec) = array_buffer_view_to_vec_checked::<f32>(data) { if data_vec.len() < 4 { return self.webgl_error(InvalidOperation); } |