diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
| commit | 972f9cd7a063d0544f8c919fd12b9a3adbd12b24 (patch) | |
| tree | f72b7df8838068916ec1c61ed02db69342d9a21b /src/gpu/GrMemoryPool.cpp | |
| parent | 0e9e6a331394721bdc47607733880d4c67b595dd (diff) | |
SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h
BUG=skia:
R=bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/216503004
git-svn-id: http://skia.googlecode.com/svn/trunk@13982 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrMemoryPool.cpp')
| -rw-r--r-- | src/gpu/GrMemoryPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp index 75a3c9a3b9..8839c66d07 100644 --- a/src/gpu/GrMemoryPool.cpp +++ b/src/gpu/GrMemoryPool.cpp @@ -16,10 +16,10 @@ GrMemoryPool::GrMemoryPool(size_t preallocSize, size_t minAllocSize) { SkDEBUGCODE(fAllocationCnt = 0); - minAllocSize = GrMax<size_t>(minAllocSize, 1 << 10); + minAllocSize = SkTMax<size_t>(minAllocSize, 1 << 10); fMinAllocSize = GrSizeAlignUp(minAllocSize + kPerAllocPad, kAlignment), fPreallocSize = GrSizeAlignUp(preallocSize + kPerAllocPad, kAlignment); - fPreallocSize = GrMax(fPreallocSize, fMinAllocSize); + fPreallocSize = SkTMax(fPreallocSize, fMinAllocSize); fHead = CreateBlock(fPreallocSize); fTail = fHead; @@ -42,7 +42,7 @@ void* GrMemoryPool::allocate(size_t size) { size += kPerAllocPad; if (fTail->fFreeSize < size) { size_t blockSize = size; - blockSize = GrMax<size_t>(blockSize, fMinAllocSize); + blockSize = SkTMax<size_t>(blockSize, fMinAllocSize); BlockHeader* block = CreateBlock(blockSize); block->fPrev = fTail; |