| Index: src/core/SkSmallAllocator.h
|
| diff --git a/src/core/SkSmallAllocator.h b/src/core/SkSmallAllocator.h
|
| index 22baa898ea21a712a2aa4b596b84ce4114c44b80..9095fa57fc11fde0022c023f5e8341d7dae819dd 100644
|
| --- a/src/core/SkSmallAllocator.h
|
| +++ b/src/core/SkSmallAllocator.h
|
| @@ -80,10 +80,12 @@ public:
|
| const size_t storageRemaining = sizeof(fStorage) - fStorageUsed;
|
| Rec* rec = &fRecs[fNumObjects];
|
| if (storageRequired > storageRemaining) {
|
| - // Allocate on the heap. Ideally we want to avoid this situation,
|
| - // but we're not sure we can catch all callers, so handle it but
|
| - // assert false in debug mode.
|
| - SkASSERT(false);
|
| + // Allocate on the heap. Ideally we want to avoid this situation.
|
| +
|
| + // With the gm composeshader_bitmap2, storage required is 4476
|
| + // and storage remaining is 3392. Increasing the base storage
|
| + // causes google 3 tests to fail.
|
| +
|
| rec->fStorageSize = 0;
|
| rec->fHeapStorage = sk_malloc_throw(storageRequired);
|
| rec->fObj = static_cast<void*>(rec->fHeapStorage);
|
|
|