Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
index 40794bb8a10cd65ab8710f2250454db70d7990a0..2a66e32531a6bb73f81b4c3b5b57990351507c22 100644 |
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
@@ -2805,7 +2805,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* scriptState, GL |
case GL_COLOR_WRITEMASK: |
return getBooleanArrayParameter(scriptState, pname); |
case GL_COMPRESSED_TEXTURE_FORMATS: |
- return WebGLAny(scriptState, DOMUint32Array::create(m_compressedTextureFormats.data(), m_compressedTextureFormats.size())); |
+ return WebGLAny(scriptState, DOMUint32Array::deprecatedCreateOrCrash(m_compressedTextureFormats.data(), m_compressedTextureFormats.size())); |
case GL_CULL_FACE: |
return getBooleanParameter(scriptState, pname); |
case GL_CULL_FACE_MODE: |
@@ -3392,21 +3392,21 @@ ScriptValue WebGLRenderingContextBase::getUniform(ScriptState* scriptState, WebG |
webContext()->getUniformfv(objectOrZero(program), location, value); |
if (length == 1) |
return WebGLAny(scriptState, value[0]); |
- return WebGLAny(scriptState, DOMFloat32Array::create(value, length)); |
+ return WebGLAny(scriptState, DOMFloat32Array::deprecatedCreateOrCrash(value, length)); |
} |
case GL_INT: { |
GLint value[4] = {0}; |
webContext()->getUniformiv(objectOrZero(program), location, value); |
if (length == 1) |
return WebGLAny(scriptState, value[0]); |
- return WebGLAny(scriptState, DOMInt32Array::create(value, length)); |
+ return WebGLAny(scriptState, DOMInt32Array::deprecatedCreateOrCrash(value, length)); |
} |
case GL_UNSIGNED_INT: { |
GLuint value[4] = {0}; |
webContext()->getUniformuiv(objectOrZero(program), location, value); |
if (length == 1) |
return WebGLAny(scriptState, value[0]); |
- return WebGLAny(scriptState, DOMUint32Array::create(value, length)); |
+ return WebGLAny(scriptState, DOMUint32Array::deprecatedCreateOrCrash(value, length)); |
} |
case GL_BOOL: { |
GLint value[4] = {0}; |
@@ -3484,11 +3484,11 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib(ScriptState* scriptState, |
VertexAttribValue& attribValue = m_vertexAttribValue[index]; |
switch (attribValue.type) { |
case Float32ArrayType: |
- return WebGLAny(scriptState, DOMFloat32Array::create(attribValue.value.floatValue, 4)); |
+ return WebGLAny(scriptState, DOMFloat32Array::deprecatedCreateOrCrash(attribValue.value.floatValue, 4)); |
case Int32ArrayType: |
- return WebGLAny(scriptState, DOMInt32Array::create(attribValue.value.intValue, 4)); |
+ return WebGLAny(scriptState, DOMInt32Array::deprecatedCreateOrCrash(attribValue.value.intValue, 4)); |
case Uint32ArrayType: |
- return WebGLAny(scriptState, DOMUint32Array::create(attribValue.value.uintValue, 4)); |
+ return WebGLAny(scriptState, DOMUint32Array::deprecatedCreateOrCrash(attribValue.value.uintValue, 4)); |
default: |
ASSERT_NOT_REACHED(); |
break; |
@@ -5358,7 +5358,7 @@ ScriptValue WebGLRenderingContextBase::getWebGLFloatArrayParameter(ScriptState* |
default: |
notImplemented(); |
} |
- return WebGLAny(scriptState, DOMFloat32Array::create(value, length)); |
+ return WebGLAny(scriptState, DOMFloat32Array::deprecatedCreateOrCrash(value, length)); |
} |
ScriptValue WebGLRenderingContextBase::getWebGLIntArrayParameter(ScriptState* scriptState, GLenum pname) |
@@ -5378,7 +5378,7 @@ ScriptValue WebGLRenderingContextBase::getWebGLIntArrayParameter(ScriptState* sc |
default: |
notImplemented(); |
} |
- return WebGLAny(scriptState, DOMInt32Array::create(value, length)); |
+ return WebGLAny(scriptState, DOMInt32Array::deprecatedCreateOrCrash(value, length)); |
} |
void WebGLRenderingContextBase::handleTextureCompleteness(const char* functionName, bool prepareToDraw) |