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/GrAllocator.h | |
| 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/GrAllocator.h')
| -rw-r--r-- | src/gpu/GrAllocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h index f2afec8e46..4e47fb1607 100644 --- a/src/gpu/GrAllocator.h +++ b/src/gpu/GrAllocator.h @@ -80,7 +80,7 @@ public: * removes all added items */ void reset() { - int blockCount = GrMax((unsigned)1, + int blockCount = SkTMax((unsigned)1, GrUIDivRoundUp(fCount, fItemsPerBlock)); for (int i = 1; i < blockCount; ++i) { sk_free(fBlocks[i]); |