Index: third_party/WebKit/Source/wtf/PartitionAlloc.h |
diff --git a/third_party/WebKit/Source/wtf/PartitionAlloc.h b/third_party/WebKit/Source/wtf/PartitionAlloc.h |
index 472d682d2791b2f3907cbe7a0cfcaae24d2650e7..ef864e86bb93ef6f7a897d447ea43a948aebc84c 100644 |
--- a/third_party/WebKit/Source/wtf/PartitionAlloc.h |
+++ b/third_party/WebKit/Source/wtf/PartitionAlloc.h |
@@ -743,6 +743,11 @@ ALWAYS_INLINE void* partitionAllocGenericFlags(PartitionRootGeneric* root, int f |
size_t requestedSize = size; |
size = partitionCookieSizeAdjustAdd(size); |
PartitionBucket* bucket = partitionGenericSizeToBucket(root, size); |
+ // TODO(bashi): Remove following RELEAE_ASSERT() once we find the cause of |
+ // http://crbug.com/514141 |
+#if OS(ANDROID) |
+ RELEASE_ASSERT(bucket >= &root->buckets[0] && bucket <= &root->buckets[kGenericNumBuckets-1]); |
haraken
2015/11/06 04:24:09
It would be more helpful to split the assert into
bashi
2015/11/06 04:40:37
Done.
|
+#endif |
spinLockLock(&root->lock); |
void* ret = partitionBucketAlloc(root, flags, size, bucket); |
spinLockUnlock(&root->lock); |