| Index: src/gpu/GrAllocPool.cpp
|
| diff --git a/src/gpu/GrAllocPool.cpp b/src/gpu/GrAllocPool.cpp
|
| index d7b553176d8eb4eee947a33021110a4e685b9c93..c92ebbd121a3740b973c8b6a0ccdb7672edfc88d 100644
|
| --- a/src/gpu/GrAllocPool.cpp
|
| +++ b/src/gpu/GrAllocPool.cpp
|
| @@ -42,7 +42,7 @@ struct GrAllocPool::Block {
|
|
|
| size_t release(size_t bytes) {
|
| SkASSERT(bytes > 0);
|
| - size_t free = GrMin(bytes, fBytesTotal - fBytesFree);
|
| + size_t free = SkTMin(bytes, fBytesTotal - fBytesFree);
|
| fBytesFree += free;
|
| fPtr -= free;
|
| return bytes - free;
|
| @@ -55,7 +55,7 @@ struct GrAllocPool::Block {
|
|
|
| GrAllocPool::GrAllocPool(size_t blockSize) {
|
| fBlock = NULL;
|
| - fMinBlockSize = GrMax(blockSize, GrAllocPool_MIN_BLOCK_SIZE);
|
| + fMinBlockSize = SkTMax(blockSize, GrAllocPool_MIN_BLOCK_SIZE);
|
| SkDEBUGCODE(fBlocksAllocated = 0;)
|
| }
|
|
|
| @@ -80,7 +80,7 @@ void* GrAllocPool::alloc(size_t size) {
|
| this->validate();
|
|
|
| if (!fBlock || !fBlock->canAlloc(size)) {
|
| - size_t blockSize = GrMax(fMinBlockSize, size);
|
| + size_t blockSize = SkTMax(fMinBlockSize, size);
|
| fBlock = Block::Create(blockSize, fBlock);
|
| SkDEBUGCODE(fBlocksAllocated += 1;)
|
| }
|
|
|