diff options
| author |  junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-30 18:35:19 +0000 |
|---|---|---|
| committer | junov@chromium.org <junov@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-30 18:35:19 +0000 |
| commit | d80a509eb773cdca6c7a9d3af4ac44a6dd24c567 (patch) | |
| tree | de619c044786405b4fd33118a391ede49bd5d803 /include/core | |
| parent | 0e86291512724b32c7d586b1ed05a77381d9bfad (diff) | |
replacing Gr* with Sk* in SkTArray.h
REVIEW=http://codereview.appspot.com/5447053/
git-svn-id: http://skia.googlecode.com/svn/trunk@2770 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkTArray.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h index 48f32d2c4a..577e8600b8 100644 --- a/include/core/SkTArray.h +++ b/include/core/SkTArray.h @@ -299,8 +299,8 @@ protected: void init(const T* array, int count, void* preAllocStorage, int preAllocOrReserveCount) { - GrAssert(count >= 0); - GrAssert(preAllocOrReserveCount >= 0); + SkASSERT(count >= 0); + SkASSERT(preAllocOrReserveCount >= 0); fCount = count; fReserveCount = (preAllocOrReserveCount > 0) ? preAllocOrReserveCount : @@ -311,8 +311,8 @@ protected: fAllocCount = fReserveCount; fMemArray = preAllocStorage; } else { - fAllocCount = GrMax(fCount, fReserveCount); - fMemArray = GrMalloc(fAllocCount * sizeof(T)); + fAllocCount = SkMax32(fCount, fReserveCount); + fMemArray = sk_malloc_throw(fAllocCount * sizeof(T)); } SkTArrayExt::copy(this, array); |