| 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 794b00e4886875c093ce712228ee90bf3aa9da48..08cd7077f736accd948189a19026e70184941f35 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| @@ -1412,7 +1412,7 @@ int WebGLRenderingContextBase::drawingBufferHeight() const
|
| return isContextLost() ? 0 : drawingBuffer()->size().height();
|
| }
|
|
|
| -unsigned WebGLRenderingContextBase::sizeInBytes(GLenum type)
|
| +unsigned WebGLRenderingContextBase::sizeInBytes(GLenum type, bool isIntegerAPI) const
|
| {
|
| switch (type) {
|
| case GL_BYTE:
|
| @@ -5171,7 +5171,7 @@ void WebGLRenderingContextBase::vertexAttribPointer(ScriptState* scriptState, GL
|
| synthesizeGLError(GL_INVALID_OPERATION, "vertexAttribPointer", "no bound ARRAY_BUFFER");
|
| return;
|
| }
|
| - unsigned typeSize = sizeInBytes(type);
|
| + unsigned typeSize = sizeInBytes(type, false);
|
| ASSERT((typeSize & (typeSize - 1)) == 0); // Ensure that the value is POT.
|
| if ((stride & (typeSize - 1)) || (static_cast<GLintptr>(offset) & (typeSize - 1))) {
|
| synthesizeGLError(GL_INVALID_OPERATION, "vertexAttribPointer", "stride or offset not valid for type");
|
|
|