Chromium Code Reviews| 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 fb622a1592c3a19a6608e8f9d254a72977d142b9..9d393eeb3048eec2d482bb1aad0eae79bcfac2db 100644 |
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
| @@ -4123,8 +4123,14 @@ void WebGLRenderingContextBase::texImageHelperDOMArrayBufferView(TexImageFunctio |
| sourceType = Tex2D; |
| else |
| sourceType = Tex3D; |
| - if (!validateTexFuncData(funcName, sourceType, level, width, height, depth, format, type, pixels, NullAllowed)) |
| - return; |
| + switch (functionType) { |
| + case TexImage: |
| + if (!validateTexFuncData(funcName, sourceType, level, width, height, depth, format, type, pixels, NullAllowed)) |
| + return; |
| + case TexSubImage: |
| + if (!validateTexFuncData(funcName, sourceType, level, width, height, depth, format, type, pixels, NullNotAllowed)) |
| + return; |
|
Ken Russell (switch to Gerrit)
2016/06/09 05:31:24
As you've seen the bots failed to compile this bec
|
| + } |
| void* data = pixels ? pixels->baseAddress() : 0; |
| Vector<uint8_t> tempData; |
| bool changeUnpackAlignment = false; |