| Index: third_party/WebKit/Source/wtf/allocator/PartitionAlloc.h
|
| diff --git a/third_party/WebKit/Source/wtf/allocator/PartitionAlloc.h b/third_party/WebKit/Source/wtf/allocator/PartitionAlloc.h
|
| index f84e9f3bf26f7b5ad44ca2a03924b5f08db6c14d..9e7a3a14264c6b739dbb1584041155775b607945 100644
|
| --- a/third_party/WebKit/Source/wtf/allocator/PartitionAlloc.h
|
| +++ b/third_party/WebKit/Source/wtf/allocator/PartitionAlloc.h
|
| @@ -658,7 +658,7 @@ ALWAYS_INLINE void* partitionAlloc(PartitionRoot* root, size_t size, const char*
|
| {
|
| #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
|
| void* result = malloc(size);
|
| - RELEASE_ASSERT(result);
|
| + CHECK(result);
|
| return result;
|
| #else
|
| size_t requestedSize = size;
|
| @@ -734,7 +734,7 @@ ALWAYS_INLINE void* partitionAllocGenericFlags(PartitionRootGeneric* root, int f
|
| {
|
| #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
|
| void* result = malloc(size);
|
| - RELEASE_ASSERT(result);
|
| + CHECK(result);
|
| return result;
|
| #else
|
| ASSERT(root->initialized);
|
| @@ -747,9 +747,9 @@ ALWAYS_INLINE void* partitionAllocGenericFlags(PartitionRootGeneric* root, int f
|
| // TODO(bashi): Remove following RELEAE_ASSERT()s once we find the cause of
|
| // http://crbug.com/514141
|
| #if OS(ANDROID)
|
| - RELEASE_ASSERT(bucket >= &root->buckets[0] || bucket == &PartitionRootGeneric::gPagedBucket);
|
| - RELEASE_ASSERT(bucket <= &root->buckets[kGenericNumBuckets - 1] || bucket == &PartitionRootGeneric::gPagedBucket);
|
| - RELEASE_ASSERT(root->initialized);
|
| + CHECK(bucket >= &root->buckets[0] || bucket == &PartitionRootGeneric::gPagedBucket);
|
| + CHECK(bucket <= &root->buckets[kGenericNumBuckets - 1] || bucket == &PartitionRootGeneric::gPagedBucket);
|
| + CHECK(root->initialized);
|
| #endif
|
| ret = partitionBucketAlloc(root, flags, size, bucket);
|
| }
|
|
|