Properly use Float32List and Int32List for WebGL uniform methods

components/script/dom/webgl2renderingcontext.rs

@@ -9,7 +9,9 @@ use dom::bindings::codegen::Bindings::WebGL2RenderingContextBinding::WebGL2Rende
 use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLContextAttributes;
 use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextMethods;
 use dom::bindings::codegen::UnionTypes::ArrayBufferViewOrArrayBuffer;
+use dom::bindings::codegen::UnionTypes::Float32ArrayOrUnrestrictedFloatSequence;
 use dom::bindings::codegen::UnionTypes::ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement;
+use dom::bindings::codegen::UnionTypes::Int32ArrayOrLongSequence;
 use dom::bindings::error::{ErrorResult, Fallible};
 use dom::bindings::reflector::{reflect_dom_object, Reflector};
 use dom::bindings::root::{Dom, DomRoot, LayoutDom};
@@ -32,7 +34,7 @@ use euclid::Size2D;
 use js::jsapi::{JSContext, JSObject};
 use js::jsval::JSVal;
 use js::rust::CustomAutoRooterGuard;
-use js::typedarray::{ArrayBufferView, Float32Array, Int32Array};
+use js::typedarray::ArrayBufferView;
 use offscreen_gl_context::GLContextAttributes;
 use script_layout_interface::HTMLCanvasDataSource;
 use std::ptr::NonNull;
@@ -610,29 +612,23 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform1iv(&self,
+    fn Uniform1iv(
-                  location: Option<&WebGLUniformLocation>,
+        &self,
-                  v: CustomAutoRooterGuard<Int32Array>) {
+        location: Option<&WebGLUniformLocation>,
+        v: Int32ArrayOrLongSequence,
+    ) {
         self.base.Uniform1iv(location, v)
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform1iv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<i32>) {
+    fn Uniform1fv(
-        self.base.Uniform1iv_(location, v);
+        &self,
-    }
+        location: Option<&WebGLUniformLocation>,
-
+        v: Float32ArrayOrUnrestrictedFloatSequence,
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+    ) {
-    fn Uniform1fv(&self,
-                  location: Option<&WebGLUniformLocation>,
-                  v: CustomAutoRooterGuard<Float32Array>) {
         self.base.Uniform1fv(location, v);
     }
 
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform1fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
-        self.base.Uniform1fv_(location, v);
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn Uniform2f(&self,
                   location: Option<&WebGLUniformLocation>,
@@ -641,15 +637,12 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform2fv(&self,
+    fn Uniform2fv(
-                  location: Option<&WebGLUniformLocation>,
+        &self,
-                  v: CustomAutoRooterGuard<Float32Array>) {
+        location: Option<&WebGLUniformLocation>,
-        self.base.Uniform2fv(location, v)
+        v: Float32ArrayOrUnrestrictedFloatSequence,
-    }
+    ) {
-
+        self.base.Uniform2fv(location, v);
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform2fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
-        self.base.Uniform2fv_(location, v);
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
@@ -660,17 +653,14 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform2iv(&self,
+    fn Uniform2iv(
-                  location: Option<&WebGLUniformLocation>,
+        &self,
-                  v: CustomAutoRooterGuard<Int32Array>) {
+        location: Option<&WebGLUniformLocation>,
+        v: Int32ArrayOrLongSequence,
+    ) {
         self.base.Uniform2iv(location, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform2iv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<i32>) {
-        self.base.Uniform2iv_(location, v);
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn Uniform3f(&self,
                   location: Option<&WebGLUniformLocation>,
@@ -679,15 +669,12 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform3fv(&self,
+    fn Uniform3fv(
-                  location: Option<&WebGLUniformLocation>,
+        &self,
-                  v: CustomAutoRooterGuard<Float32Array>) {
+        location: Option<&WebGLUniformLocation>,
-        self.base.Uniform3fv(location, v)
+        v: Float32ArrayOrUnrestrictedFloatSequence,
-    }
+    ) {
-
+        self.base.Uniform3fv(location, v);
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform3fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
-        self.base.Uniform3fv_(location, v);
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
@@ -698,19 +685,14 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform3iv(&self,
+    fn Uniform3iv(
-                  location: Option<&WebGLUniformLocation>,
+        &self,
-                  v: CustomAutoRooterGuard<Int32Array>) {
+        location: Option<&WebGLUniformLocation>,
+        v: Int32ArrayOrLongSequence,
+    ) {
         self.base.Uniform3iv(location, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform3iv_(&self,
-                  location: Option<&WebGLUniformLocation>,
-                  v: Vec<i32>) {
-        self.base.Uniform3iv_(location, v)
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn Uniform4i(&self,
                   location: Option<&WebGLUniformLocation>,
@@ -718,21 +700,15 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
         self.base.Uniform4i(location, x, y, z, w)
     }
 
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform4iv(&self,
+    fn Uniform4iv(
-                  location: Option<&WebGLUniformLocation>,
+        &self,
-                  v: CustomAutoRooterGuard<Int32Array>) {
+        location: Option<&WebGLUniformLocation>,
+        v: Int32ArrayOrLongSequence,
+    ) {
         self.base.Uniform4iv(location, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform4iv_(&self,
-                  location: Option<&WebGLUniformLocation>,
-                  v: Vec<i32>) {
-        self.base.Uniform4iv_(location, v)
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn Uniform4f(&self,
                   location: Option<&WebGLUniformLocation>,
@@ -741,56 +717,44 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform4fv(&self,
+    fn Uniform4fv(
-                  location: Option<&WebGLUniformLocation>,
+        &self,
-                  v: CustomAutoRooterGuard<Float32Array>) {
+        location: Option<&WebGLUniformLocation>,
-        self.base.Uniform4fv(location, v)
+        v: Float32ArrayOrUnrestrictedFloatSequence,
-    }
+    ) {
-
+        self.base.Uniform4fv(location, v);
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn Uniform4fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
-        self.base.Uniform4fv_(location, v);
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn UniformMatrix2fv(&self,
+    fn UniformMatrix2fv(
-                        location: Option<&WebGLUniformLocation>,
+        &self,
-                        transpose: bool,
+        location: Option<&WebGLUniformLocation>,
-                        v: CustomAutoRooterGuard<Float32Array>) {
+        transpose: bool,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
+    ) {
         self.base.UniformMatrix2fv(location, transpose, v)
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn UniformMatrix2fv_(&self, location: Option<&WebGLUniformLocation>, transpose: bool, value: Vec<f32>) {
+    fn UniformMatrix3fv(
-        self.base.UniformMatrix2fv_(location, transpose, value);
+        &self,
-    }
+        location: Option<&WebGLUniformLocation>,
-
+        transpose: bool,
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        v: Float32ArrayOrUnrestrictedFloatSequence,
-    fn UniformMatrix3fv(&self,
+    ) {
-                        location: Option<&WebGLUniformLocation>,
-                        transpose: bool,
-                        v: CustomAutoRooterGuard<Float32Array>) {
         self.base.UniformMatrix3fv(location, transpose, v)
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn UniformMatrix3fv_(&self, location: Option<&WebGLUniformLocation>, transpose: bool, value: Vec<f32>) {
+    fn UniformMatrix4fv(
-        self.base.UniformMatrix3fv_(location, transpose, value);
+        &self,
-    }
+        location: Option<&WebGLUniformLocation>,
-
+        transpose: bool,
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        v: Float32ArrayOrUnrestrictedFloatSequence,
-    fn UniformMatrix4fv(&self,
+    ) {
-                        location: Option<&WebGLUniformLocation>,
-                        transpose: bool,
-                        v: CustomAutoRooterGuard<Float32Array>) {
         self.base.UniformMatrix4fv(location, transpose, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn UniformMatrix4fv_(&self, location: Option<&WebGLUniformLocation>, transpose: bool, value: Vec<f32>) {
-        self.base.UniformMatrix4fv_(location, transpose, value);
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9
     fn UseProgram(&self, program: Option<&WebGLProgram>) {
         self.base.UseProgram(program)
@@ -807,60 +771,40 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib1fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib1fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
         self.base.VertexAttrib1fv(indx, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib1fv_(&self, indx: u32, v: Vec<f32>) {
-        self.base.VertexAttrib1fv_(indx, v)
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn VertexAttrib2f(&self, indx: u32, x: f32, y: f32) {
         self.base.VertexAttrib2f(indx, x, y)
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib2fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib2fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
         self.base.VertexAttrib2fv(indx, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib2fv_(&self, indx: u32, v: Vec<f32>) {
-        self.base.VertexAttrib2fv_(indx, v)
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn VertexAttrib3f(&self, indx: u32, x: f32, y: f32, z: f32) {
         self.base.VertexAttrib3f(indx, x, y, z)
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib3fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib3fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
         self.base.VertexAttrib3fv(indx, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib3fv_(&self, indx: u32, v: Vec<f32>) {
-        self.base.VertexAttrib3fv_(indx, v)
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn VertexAttrib4f(&self, indx: u32, x: f32, y: f32, z: f32, w: f32) {
         self.base.VertexAttrib4f(indx, x, y, z, w)
     }
 
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib4fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib4fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
         self.base.VertexAttrib4fv(indx, v)
     }
 
-    /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib4fv_(&self, indx: u32, v: Vec<f32>) {
-        self.base.VertexAttrib4fv_(indx, v)
-    }
-
     /// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
     fn VertexAttribPointer(&self, attrib_id: u32, size: i32, data_type: u32,
                            normalized: bool, stride: i32, offset: i64) {

components/script/dom/webglrenderingcontext.rs

@@ -15,7 +15,9 @@ use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::{self, WebGL
 use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
 use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextMethods;
 use dom::bindings::codegen::UnionTypes::ArrayBufferViewOrArrayBuffer;
+use dom::bindings::codegen::UnionTypes::Float32ArrayOrUnrestrictedFloatSequence;
 use dom::bindings::codegen::UnionTypes::ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement;
+use dom::bindings::codegen::UnionTypes::Int32ArrayOrLongSequence;
 use dom::bindings::conversions::ToJSValConvertible;
 use dom::bindings::error::{Error, ErrorResult};
 use dom::bindings::inheritance::Castable;
@@ -50,7 +52,7 @@ use half::f16;
 use js::jsapi::{JSContext, JSObject, Type};
 use js::jsval::{BooleanValue, DoubleValue, Int32Value, JSVal, NullValue, UndefinedValue};
 use js::rust::CustomAutoRooterGuard;
-use js::typedarray::{ArrayBufferView, Float32Array, Int32Array};
+use js::typedarray::ArrayBufferView;
 use net_traits::image::base::PixelFormat;
 use net_traits::image_cache::ImageResponse;
 use offscreen_gl_context::{GLContextAttributes, GLLimits};
@@ -2873,13 +2875,12 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform1iv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Int32Array>,
+        v: Int32ArrayOrLongSequence,
     ) {
-        self.Uniform1iv_(location, v.to_vec());
+        let v = match v {
-    }
+            Int32ArrayOrLongSequence::Int32Array(v) => v.to_vec(),
-
+            Int32ArrayOrLongSequence::LongSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform1iv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<i32>) {
         if self.validate_uniform_parameters(location, UniformSetterType::Int, &v) {
             self.send_command(WebGLCommand::Uniform1iv(location.unwrap().id(), v))
         }
@@ -2889,13 +2890,12 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform1fv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Float32Array>,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
     ) {
-        self.Uniform1fv_(location, v.to_vec());
+        let v = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform1fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
         if self.validate_uniform_parameters(location, UniformSetterType::Float, &v) {
             self.send_command(WebGLCommand::Uniform1fv(location.unwrap().id(), v));
         }
@@ -2914,16 +2914,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform2fv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Float32Array>,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
     ) {
-        self.Uniform2fv_(location, v.to_vec());
+        let v = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform2fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
+        if self.validate_uniform_parameters(location, UniformSetterType::FloatVec2, &v) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::FloatVec2,
-                                            &v) {
             self.send_command(WebGLCommand::Uniform2fv(location.unwrap().id(), v));
         }
     }
@@ -2946,16 +2943,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform2iv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Int32Array>,
+        v: Int32ArrayOrLongSequence,
     ) {
-        self.Uniform2iv_(location, v.to_vec());
+        let v = match v {
-    }
+            Int32ArrayOrLongSequence::Int32Array(v) => v.to_vec(),
-
+            Int32ArrayOrLongSequence::LongSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform2iv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<i32>) {
+        if self.validate_uniform_parameters(location, UniformSetterType::IntVec2, &v) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::IntVec2,
-                                            &v) {
             self.send_command(WebGLCommand::Uniform2iv(location.unwrap().id(), v));
         }
     }
@@ -2979,16 +2973,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform3fv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Float32Array>,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
     ) {
-        self.Uniform3fv_(location, v.to_vec());
+        let v = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform3fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
+        if self.validate_uniform_parameters(location, UniformSetterType::FloatVec3, &v) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::FloatVec3,
-                                            &v) {
             self.send_command(WebGLCommand::Uniform3fv(location.unwrap().id(), v))
         }
     }
@@ -3008,16 +2999,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform3iv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Int32Array>,
+        v: Int32ArrayOrLongSequence,
     ) {
-        self.Uniform3iv_(location, v.to_vec());
+        let v = match v {
-    }
+            Int32ArrayOrLongSequence::Int32Array(v) => v.to_vec(),
-
+            Int32ArrayOrLongSequence::LongSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform3iv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<i32>) {
+        if self.validate_uniform_parameters(location, UniformSetterType::IntVec3, &v) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::IntVec3,
-                                            &v) {
             self.send_command(WebGLCommand::Uniform3iv(location.unwrap().id(), v))
         }
     }
@@ -3043,16 +3031,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform4iv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Int32Array>,
+        v: Int32ArrayOrLongSequence,
     ) {
-        self.Uniform4iv_(location, v.to_vec());
+        let v = match v {
-    }
+            Int32ArrayOrLongSequence::Int32Array(v) => v.to_vec(),
-
+            Int32ArrayOrLongSequence::LongSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform4iv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<i32>) {
+        if self.validate_uniform_parameters(location, UniformSetterType::IntVec4, &v) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::IntVec4,
-                                            &v) {
             self.send_command(WebGLCommand::Uniform4iv(location.unwrap().id(), v))
         }
     }
@@ -3077,16 +3062,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     fn Uniform4fv(
         &self,
         location: Option<&WebGLUniformLocation>,
-        v: CustomAutoRooterGuard<Float32Array>,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
     ) {
-        self.Uniform4fv_(location, v.to_vec());
+        let v = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn Uniform4fv_(&self, location: Option<&WebGLUniformLocation>, v: Vec<f32>) {
+        if self.validate_uniform_parameters(location, UniformSetterType::FloatVec4, &v) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::FloatVec4,
-                                            &v) {
             self.send_command(WebGLCommand::Uniform4fv(location.unwrap().id(), v))
         }
     }
@@ -3096,20 +3078,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
         &self,
         location: Option<&WebGLUniformLocation>,
         transpose: bool,
-        v: CustomAutoRooterGuard<Float32Array>,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
     ) {
-        self.UniformMatrix2fv_(location, transpose, v.to_vec());
+        let v = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn UniformMatrix2fv_(&self,
+        if self.validate_uniform_parameters(location, UniformSetterType::FloatMat2, &v) {
-                         location: Option<&WebGLUniformLocation>,
+            self.send_command(WebGLCommand::UniformMatrix2fv(location.unwrap().id(), transpose, v));
-                         transpose: bool,
-                         value: Vec<f32>) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::FloatMat2,
-                                            &value) {
-            self.send_command(WebGLCommand::UniformMatrix2fv(location.unwrap().id(), transpose, value));
         }
     }
 
@@ -3118,22 +3094,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
         &self,
         location: Option<&WebGLUniformLocation>,
         transpose: bool,
-        v: CustomAutoRooterGuard<Float32Array>,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
     ) {
-        self.UniformMatrix3fv_(location, transpose, v.to_vec());
+        let v = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn UniformMatrix3fv_(
+        if self.validate_uniform_parameters(location, UniformSetterType::FloatMat3, &v) {
-        &self,
+            self.send_command(WebGLCommand::UniformMatrix3fv(location.unwrap().id(), transpose, v));
-        location: Option<&WebGLUniformLocation>,
-        transpose: bool,
-        value: Vec<f32>,
-    ) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::FloatMat3,
-                                            &value) {
-            self.send_command(WebGLCommand::UniformMatrix3fv(location.unwrap().id(), transpose, value));
         }
     }
 
@@ -3142,22 +3110,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
         &self,
         location: Option<&WebGLUniformLocation>,
         transpose: bool,
-        v: CustomAutoRooterGuard<Float32Array>,
+        v: Float32ArrayOrUnrestrictedFloatSequence,
     ) {
-        self.UniformMatrix4fv_(location, transpose, v.to_vec());
+        let v = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn UniformMatrix4fv_(
+        if self.validate_uniform_parameters(location, UniformSetterType::FloatMat4, &v) {
-        &self,
+            self.send_command(WebGLCommand::UniformMatrix4fv(location.unwrap().id(), transpose, v));
-        location: Option<&WebGLUniformLocation>,
-        transpose: bool,
-        value: Vec<f32>,
-    ) {
-        if self.validate_uniform_parameters(location,
-                                            UniformSetterType::FloatMat4,
-                                            &value) {
-            self.send_command(WebGLCommand::UniformMatrix4fv(location.unwrap().id(), transpose, value));
         }
     }
 
@@ -3184,16 +3144,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib1fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib1fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
-        self.VertexAttrib1fv_(indx, v.to_vec());
+        let values = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn VertexAttrib1fv_(&self, indx: u32, values: Vec<f32>) {
         if values.len() < 1 {
             return self.webgl_error(InvalidOperation);
         }
-
         self.vertex_attrib(indx, values[0], 0f32, 0f32, 1f32);
     }
 
@@ -3203,16 +3161,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib2fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib2fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
-        self.VertexAttrib2fv_(indx, v.to_vec());
+        let values = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn VertexAttrib2fv_(&self, indx: u32, values: Vec<f32>) {
         if values.len() < 2 {
             return self.webgl_error(InvalidOperation);
         }
-
         self.vertex_attrib(indx, values[0], values[1], 0f32, 1f32);
     }
 
@@ -3222,16 +3178,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib3fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib3fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
-        self.VertexAttrib3fv_(indx, v.to_vec());
+        let values = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn VertexAttrib3fv_(&self, indx: u32, values: Vec<f32>) {
         if values.len() < 3 {
             return self.webgl_error(InvalidOperation);
         }
-
         self.vertex_attrib(indx, values[0], values[1], values[2], 1f32);
     }
 
@@ -3241,16 +3195,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
     }
 
     // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
-    fn VertexAttrib4fv(&self, indx: u32, v: CustomAutoRooterGuard<Float32Array>) {
+    fn VertexAttrib4fv(&self, indx: u32, v: Float32ArrayOrUnrestrictedFloatSequence) {
-        self.VertexAttrib4fv_(indx, v.to_vec());
+        let values = match v {
-    }
+            Float32ArrayOrUnrestrictedFloatSequence::Float32Array(v) => v.to_vec(),
-
+            Float32ArrayOrUnrestrictedFloatSequence::UnrestrictedFloatSequence(v) => v,
-    // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10
+        };
-    fn VertexAttrib4fv_(&self, indx: u32, values: Vec<f32>) {
         if values.len() < 4 {
             return self.webgl_error(InvalidOperation);
         }
-
         self.vertex_attrib(indx, values[0], values[1], values[2], values[3]);
     }
 

components/script/dom/webidls/WebGLRenderingContext.webidl

@@ -29,6 +29,9 @@ typedef (ImageData or
          HTMLCanvasElement or
          HTMLVideoElement) TexImageSource;
 
+typedef (/*[AllowShared]*/ Float32Array or sequence<GLfloat>) Float32List;
+typedef (/*[AllowShared]*/ Int32Array or sequence<GLint>) Int32List;
+
 dictionary WebGLContextAttributes {
     GLboolean alpha = true;
     GLboolean depth = true;
@@ -652,30 +655,19 @@ interface WebGLRenderingContextBase
     void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
     void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
 
-    void uniform1fv(WebGLUniformLocation? location, Float32Array v);
+    void uniform1fv(WebGLUniformLocation? location, Float32List v);
-    void uniform1fv(WebGLUniformLocation? location, sequence<GLfloat> v);
+    void uniform2fv(WebGLUniformLocation? location, Float32List v);
-    void uniform2fv(WebGLUniformLocation? location, Float32Array v);
+    void uniform3fv(WebGLUniformLocation? location, Float32List v);
-    void uniform2fv(WebGLUniformLocation? location, sequence<GLfloat> v);
+    void uniform4fv(WebGLUniformLocation? location, Float32List v);
-    void uniform3fv(WebGLUniformLocation? location, Float32Array v);
-    void uniform3fv(WebGLUniformLocation? location, sequence<GLfloat> v);
-    void uniform4fv(WebGLUniformLocation? location, Float32Array v);
-    void uniform4fv(WebGLUniformLocation? location, sequence<GLfloat> v);
 
-    void uniform1iv(WebGLUniformLocation? location, Int32Array v);
+    void uniform1iv(WebGLUniformLocation? location, Int32List v);
-    void uniform1iv(WebGLUniformLocation? location, sequence<long> v);
+    void uniform2iv(WebGLUniformLocation? location, Int32List v);
-    void uniform2iv(WebGLUniformLocation? location, Int32Array v);
+    void uniform3iv(WebGLUniformLocation? location, Int32List v);
-    void uniform2iv(WebGLUniformLocation? location, sequence<long> v);
+    void uniform4iv(WebGLUniformLocation? location, Int32List v);
-    void uniform3iv(WebGLUniformLocation? location, Int32Array v);
-    void uniform3iv(WebGLUniformLocation? location, sequence<long> v);
-    void uniform4iv(WebGLUniformLocation? location, Int32Array v);
-    void uniform4iv(WebGLUniformLocation? location, sequence<long> v);
 
-    void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value);
+    void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List value);
-    void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value);
+    void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List value);
-    void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value);
+    void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List value);
-    void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value);
-    void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value);
-    void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value);
 
     void useProgram(WebGLProgram? program);
     void validateProgram(WebGLProgram program);
@@ -685,14 +677,10 @@ interface WebGLRenderingContextBase
     void vertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
     void vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
 
-    void vertexAttrib1fv(GLuint indx, Float32Array values);
+    void vertexAttrib1fv(GLuint indx, Float32List values);
-    void vertexAttrib1fv(GLuint indx, sequence<GLfloat> values);
+    void vertexAttrib2fv(GLuint indx, Float32List values);
-    void vertexAttrib2fv(GLuint indx, Float32Array values);
+    void vertexAttrib3fv(GLuint indx, Float32List values);
-    void vertexAttrib2fv(GLuint indx, sequence<GLfloat> values);
+    void vertexAttrib4fv(GLuint indx, Float32List values);
-    void vertexAttrib3fv(GLuint indx, Float32Array values);
-    void vertexAttrib3fv(GLuint indx, sequence<GLfloat> values);
-    void vertexAttrib4fv(GLuint indx, Float32Array values);
-    void vertexAttrib4fv(GLuint indx, sequence<GLfloat> values);
 
     void vertexAttribPointer(GLuint indx, GLint size, GLenum type,
                              GLboolean normalized, GLsizei stride, GLintptr offset);