aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrMemoryPool.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-14 21:53:24 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-14 21:53:24 +0000
commitadacc7067ad617cdc7bbef39192ca80f4b4d27f9 (patch)
tree3f6a13154d08c42648ccea82257f37f7c321b00e /src/gpu/GrMemoryPool.cpp
parent04b57f87ab6789f7fc302eda8a993d88d4feea8f (diff)
Start cleaning up 64bit Win warnings
Diffstat (limited to 'src/gpu/GrMemoryPool.cpp')
-rw-r--r--src/gpu/GrMemoryPool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp
index deb7d1a814..75a3c9a3b9 100644
--- a/src/gpu/GrMemoryPool.cpp
+++ b/src/gpu/GrMemoryPool.cpp
@@ -41,7 +41,7 @@ void* GrMemoryPool::allocate(size_t size) {
size = GrSizeAlignUp(size, kAlignment);
size += kPerAllocPad;
if (fTail->fFreeSize < size) {
- int blockSize = size;
+ size_t blockSize = size;
blockSize = GrMax<size_t>(blockSize, fMinAllocSize);
BlockHeader* block = CreateBlock(blockSize);