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 9a12f19244abe114d8f6e7df62de32533c69b3e5..c368abc80a521f9420ad6ce3927addef2ca701b1 100644 |
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp |
@@ -6018,11 +6018,11 @@ bool WebGLRenderingContextBase::validateCompressedTexFuncData(const char* functi |
(int)format - GL_COMPRESSED_RGBA_ASTC_4x4_KHR : (int)format - GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR; |
const int kBlockSize = 16; |
- const int kBlockWidth = WebGLCompressedTextureASTC::kBlockSizeCompressASTC[index].blockWidth; |
- const int kBlockHeight = WebGLCompressedTextureASTC::kBlockSizeCompressASTC[index].blockHeight; |
+ const int blockWidth = WebGLCompressedTextureASTC::kBlockSizeCompressASTC[index].blockWidth; |
+ const int blockHeight = WebGLCompressedTextureASTC::kBlockSizeCompressASTC[index].blockHeight; |
- CheckedInt<unsigned> numBlocksAcross = (CheckedInt<unsigned>(width) + kBlockWidth - 1) / kBlockWidth; |
- CheckedInt<unsigned> numBlocksDown = (CheckedInt<unsigned>(height) + kBlockHeight - 1) / kBlockHeight; |
+ CheckedInt<unsigned> numBlocksAcross = (CheckedInt<unsigned>(width) + blockWidth - 1) / blockWidth; |
+ CheckedInt<unsigned> numBlocksDown = (CheckedInt<unsigned>(height) + blockHeight - 1) / blockHeight; |
CheckedInt<unsigned> numBlocks = numBlocksAcross * numBlocksDown; |
bytesRequired = numBlocks * kBlockSize; |
} |