Fix a bug in WebGL2's uniform*() with sub source.

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 2394 matching lines @@
 void WebGL2RenderingContextBase::uniform1fv(
     const WebGLUniformLocation* location,
     const FlexibleFloat32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Float32Array>("uniform1fv", location, v,
                                                     1, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform1fv(location->location(), v.length(),
+  contextGL()->Uniform1fv(location->location(),
+                          srcLength ? srcLength : (v.length() - srcOffset),
                           v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform1fv(
     const WebGLUniformLocation* location,
     Vector<GLfloat>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform1fv", location, v.data(), v.size(), 1,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform1fv(location->location(), v.size(), v.data() + srcOffset);
+  contextGL()->Uniform1fv(location->location(),
+                          srcLength ? srcLength : (v.size() - srcOffset),
+                          v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform2fv(
     const WebGLUniformLocation* location,
     const FlexibleFloat32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Float32Array>("uniform2fv", location, v,
                                                     2, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform2fv(location->location(), v.length() >> 1,
-                          v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform2fv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) >> 1,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform2fv(
     const WebGLUniformLocation* location,
     Vector<GLfloat>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform2fv", location, v.data(), v.size(), 2,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform2fv(location->location(), v.size() >> 1,
+  contextGL()->Uniform2fv(location->location(),
+                          (srcLength ? srcLength : (v.size() - srcOffset)) >> 1,
                           v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform3fv(
     const WebGLUniformLocation* location,
     const FlexibleFloat32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Float32Array>("uniform3fv", location, v,
                                                     3, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform3fv(location->location(), v.length() / 3,
-                          v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform3fv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) / 3,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform3fv(
     const WebGLUniformLocation* location,
     Vector<GLfloat>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform3fv", location, v.data(), v.size(), 3,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform3fv(location->location(), v.size() / 3,
+  contextGL()->Uniform3fv(location->location(),
+                          (srcLength ? srcLength : (v.size() - srcOffset)) / 3,
                           v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform4fv(
     const WebGLUniformLocation* location,
     const FlexibleFloat32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Float32Array>("uniform4fv", location, v,
                                                     4, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform4fv(location->location(), v.length() >> 2,
-                          v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform4fv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) >> 2,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform4fv(
     const WebGLUniformLocation* location,
     Vector<GLfloat>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform4fv", location, v.data(), v.size(), 4,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform4fv(location->location(), v.size() >> 2,
+  contextGL()->Uniform4fv(location->location(),
+                          (srcLength ? srcLength : (v.size() - srcOffset)) >> 2,
                           v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform1iv(
     const WebGLUniformLocation* location,
     const FlexibleInt32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Int32Array>("uniform1iv", location, v, 1,
                                                   srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform1iv(location->location(), v.length(),
+  contextGL()->Uniform1iv(location->location(),
+                          srcLength ? srcLength : (v.length() - srcOffset),
                           v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform1iv(
     const WebGLUniformLocation* location,
     Vector<GLint>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform1iv", location, v.data(), v.size(), 1,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform1iv(location->location(), v.size(), v.data() + srcOffset);
+  contextGL()->Uniform1iv(location->location(),
+                          srcLength ? srcLength : (v.size() - srcOffset),
+                          v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform2iv(
     const WebGLUniformLocation* location,
     const FlexibleInt32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Int32Array>("uniform2iv", location, v, 2,
                                                   srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform2iv(location->location(), v.length() >> 1,
-                          v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform2iv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) >> 1,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform2iv(
     const WebGLUniformLocation* location,
     Vector<GLint>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform2iv", location, v.data(), v.size(), 2,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform2iv(location->location(), v.size() >> 1,
+  contextGL()->Uniform2iv(location->location(),
+                          (srcLength ? srcLength : (v.size() - srcOffset)) >> 1,
                           v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform3iv(
     const WebGLUniformLocation* location,
     const FlexibleInt32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Int32Array>("uniform3iv", location, v, 3,
                                                   srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform3iv(location->location(), v.length() / 3,
-                          v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform3iv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) / 3,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform3iv(
     const WebGLUniformLocation* location,
     Vector<GLint>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform3iv", location, v.data(), v.size(), 3,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform3iv(location->location(), v.size() / 3,
+  contextGL()->Uniform3iv(location->location(),
+                          (srcLength ? srcLength : (v.size() - srcOffset)) / 3,
                           v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform4iv(
     const WebGLUniformLocation* location,
     const FlexibleInt32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Int32Array>("uniform4iv", location, v, 4,
                                                   srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform4iv(location->location(), v.length() >> 2,
-                          v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform4iv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) >> 2,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform4iv(
     const WebGLUniformLocation* location,
     Vector<GLint>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform4iv", location, v.data(), v.size(), 4,
                                  srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform4iv(location->location(), v.size() >> 2,
+  contextGL()->Uniform4iv(location->location(),
+                          (srcLength ? srcLength : (v.size() - srcOffset)) >> 2,
                           v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform1uiv(
     const WebGLUniformLocation* location,
     const FlexibleUint32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Uint32Array>("uniform1uiv", location, v,
                                                    1, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform1uiv(location->location(), v.length(),
+  contextGL()->Uniform1uiv(location->location(),
+                           srcLength ? srcLength : (v.length() - srcOffset),
                            v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform1uiv(
     const WebGLUniformLocation* location,
     Vector<GLuint>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform1uiv", location, value.data(),
                                  value.size(), 1, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform1uiv(location->location(), value.size(),
+  contextGL()->Uniform1uiv(location->location(),
+                           srcLength ? srcLength : (value.size() - srcOffset),
                            value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform2uiv(
     const WebGLUniformLocation* location,
     const FlexibleUint32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Uint32Array>("uniform2uiv", location, v,
                                                    2, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform2uiv(location->location(), v.length() >> 1,
-                           v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform2uiv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) >> 1,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform2uiv(
     const WebGLUniformLocation* location,
     Vector<GLuint>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform2uiv", location, value.data(),
                                  value.size(), 2, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform2uiv(location->location(), value.size() / 2,
-                           value.data() + srcOffset);
+  contextGL()->Uniform2uiv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) >> 1,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform3uiv(
     const WebGLUniformLocation* location,
     const FlexibleUint32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Uint32Array>("uniform3uiv", location, v,
                                                    3, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform3uiv(location->location(), v.length() / 3,
-                           v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform3uiv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) / 3,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform3uiv(
     const WebGLUniformLocation* location,
     Vector<GLuint>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform3uiv", location, value.data(),
                                  value.size(), 3, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform3uiv(location->location(), value.size() / 3,
-                           value.data() + srcOffset);
+  contextGL()->Uniform3uiv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) / 3,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform4uiv(
     const WebGLUniformLocation* location,
     const FlexibleUint32ArrayView& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters<WTF::Uint32Array>("uniform4uiv", location, v,
                                                    4, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform4uiv(location->location(), v.length() >> 2,
-                           v.dataMaybeOnStack() + srcOffset);
+  contextGL()->Uniform4uiv(
+      location->location(),
+      (srcLength ? srcLength : (v.length() - srcOffset)) >> 2,
+      v.dataMaybeOnStack() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform4uiv(
     const WebGLUniformLocation* location,
     Vector<GLuint>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformParameters("uniform4uiv", location, value.data(),
                                  value.size(), 4, srcOffset, srcLength))
     return;
 
-  contextGL()->Uniform4uiv(location->location(), value.size() / 4,
-                           value.data() + srcOffset);
+  contextGL()->Uniform4uiv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) >> 2,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix2fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose,
                                        v, 4, srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix2fv(location->location(), v->length() >> 2,
-                                transpose, v->data() + srcOffset);
+  contextGL()->UniformMatrix2fv(
+      location->location(),
+      (srcLength ? srcLength : (v->length() - srcOffset)) >> 2, transpose,
+      v->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix2fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose,
                                        v.data(), v.size(), 4, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix2fv(location->location(), v.size() >> 2, transpose,
-                                v.data() + srcOffset);
+  contextGL()->UniformMatrix2fv(
+      location->location(),
+      (srcLength ? srcLength : (v.size() - srcOffset)) >> 2, transpose,
+      v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix3fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose,
                                        v, 9, srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix3fv(location->location(), v->length() / 9,
-                                transpose, v->data() + srcOffset);
+  contextGL()->UniformMatrix3fv(
+      location->location(),
+      (srcLength ? srcLength : (v->length() - srcOffset)) / 9, transpose,
+      v->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix3fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose,
                                        v.data(), v.size(), 9, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix3fv(location->location(), v.size() / 9, transpose,
-                                v.data() + srcOffset);
+  contextGL()->UniformMatrix3fv(
+      location->location(),
+      (srcLength ? srcLength : (v.size() - srcOffset)) / 9, transpose,
+      v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix4fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose,
                                        v, 16, srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix4fv(location->location(), v->length() >> 4,
-                                transpose, v->data() + srcOffset);
+  contextGL()->UniformMatrix4fv(
+      location->location(),
+      (srcLength ? srcLength : (v->length() - srcOffset)) >> 4, transpose,
+      v->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix4fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& v,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose,
                                        v.data(), v.size(), 16, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix4fv(location->location(), v.size() >> 4, transpose,
-                                v.data() + srcOffset);
+  contextGL()->UniformMatrix4fv(
+      location->location(),
+      (srcLength ? srcLength : (v.size() - srcOffset)) >> 4, transpose,
+      v.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix2x3fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix2x3fv", location,
                                        transpose, value, 6, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix2x3fv(location->location(), value->length() / 6,
-                                  transpose, value->data() + srcOffset);
+  contextGL()->UniformMatrix2x3fv(
+      location->location(),
+      (srcLength ? srcLength : (value->length() - srcOffset)) / 6, transpose,
+      value->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix2x3fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix2x3fv", location,
                                        transpose, value.data(), value.size(), 6,
                                        srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix2x3fv(location->location(), value.size() / 6,
-                                  transpose, value.data() + srcOffset);
+  contextGL()->UniformMatrix2x3fv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) / 6, transpose,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix3x2fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix3x2fv", location,
                                        transpose, value, 6, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix3x2fv(location->location(), value->length() / 6,
-                                  transpose, value->data() + srcOffset);
+  contextGL()->UniformMatrix3x2fv(
+      location->location(),
+      (srcLength ? srcLength : (value->length() - srcOffset)) / 6, transpose,
+      value->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix3x2fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix3x2fv", location,
                                        transpose, value.data(), value.size(), 6,
                                        srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix3x2fv(location->location(), value.size() / 6,
-                                  transpose, value.data() + srcOffset);
+  contextGL()->UniformMatrix3x2fv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) / 6, transpose,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix2x4fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix2x4fv", location,
                                        transpose, value, 8, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix2x4fv(location->location(), value->length() / 8,
-                                  transpose, value->data() + srcOffset);
+  contextGL()->UniformMatrix2x4fv(
+      location->location(),
+      (srcLength ? srcLength : (value->length() - srcOffset)) >> 3, transpose,
+      value->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix2x4fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix2x4fv", location,
                                        transpose, value.data(), value.size(), 8,
                                        srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix2x4fv(location->location(), value.size() / 8,
-                                  transpose, value.data() + srcOffset);
+  contextGL()->UniformMatrix2x4fv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) >> 3, transpose,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix4x2fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix4x2fv", location,
                                        transpose, value, 8, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix4x2fv(location->location(), value->length() / 8,
-                                  transpose, value->data() + srcOffset);
+  contextGL()->UniformMatrix4x2fv(
+      location->location(),
+      (srcLength ? srcLength : (value->length() - srcOffset)) >> 3, transpose,
+      value->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix4x2fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix4x2fv", location,
                                        transpose, value.data(), value.size(), 8,
                                        srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix4x2fv(location->location(), value.size() / 8,
-                                  transpose, value.data() + srcOffset);
+  contextGL()->UniformMatrix4x2fv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) >> 3, transpose,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix3x4fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix3x4fv", location,
                                        transpose, value, 12, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix3x4fv(location->location(), value->length() / 12,
-                                  transpose, value->data() + srcOffset);
+  contextGL()->UniformMatrix3x4fv(
+      location->location(),
+      (srcLength ? srcLength : (value->length() - srcOffset)) / 12, transpose,
+      value->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix3x4fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix3x4fv", location,
                                        transpose, value.data(), value.size(),
                                        12, srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix3x4fv(location->location(), value.size() / 12,
-                                  transpose, value.data() + srcOffset);
+  contextGL()->UniformMatrix3x4fv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) / 12, transpose,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix4x3fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     DOMFloat32Array* value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix4x3fv", location,
                                        transpose, value, 12, srcOffset,
                                        srcLength))
     return;
-  contextGL()->UniformMatrix4x3fv(location->location(), value->length() / 12,
-                                  transpose, value->data() + srcOffset);
+  contextGL()->UniformMatrix4x3fv(
+      location->location(),
+      (srcLength ? srcLength : (value->length() - srcOffset)) / 12, transpose,
+      value->data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniformMatrix4x3fv(
     const WebGLUniformLocation* location,
     GLboolean transpose,
     Vector<GLfloat>& value,
     GLuint srcOffset,
     GLuint srcLength) {
   if (isContextLost() ||
       !validateUniformMatrixParameters("uniformMatrix4x3fv", location,
                                        transpose, value.data(), value.size(),
                                        12, srcOffset, srcLength))
     return;
-  contextGL()->UniformMatrix4x3fv(location->location(), value.size() / 12,
-                                  transpose, value.data() + srcOffset);
+  contextGL()->UniformMatrix4x3fv(
+      location->location(),
+      (srcLength ? srcLength : (value.size() - srcOffset)) / 12, transpose,
+      value.data() + srcOffset);
 }
 
 void WebGL2RenderingContextBase::uniform1fv(
     const WebGLUniformLocation* location,
     const FlexibleFloat32ArrayView& v) {
   WebGLRenderingContextBase::uniform1fv(location, v);
 }
 
 void WebGL2RenderingContextBase::uniform1fv(
     const WebGLUniformLocation* location,
@@ skipping 2579 matching lines @@
 
 void WebGL2RenderingContextBase::
     DrawingBufferClientRestorePixelUnpackBufferBinding() {
   if (!contextGL())
     return;
   contextGL()->BindBuffer(GL_PIXEL_UNPACK_BUFFER,
                           objectOrZero(m_boundPixelUnpackBuffer.get()));
 }
 
 }  // namespace blink