Chromium Code Reviews| Index: third_party/WebKit/Source/platform/wtf/HashTable.h |
| diff --git a/third_party/WebKit/Source/platform/wtf/HashTable.h b/third_party/WebKit/Source/platform/wtf/HashTable.h |
| index 0907c7420f897798365749fadea97240eb6041d2..800b4d5d941b2e1e5a48fe34d9578cdc189f32f3 100644 |
| --- a/third_party/WebKit/Source/platform/wtf/HashTable.h |
| +++ b/third_party/WebKit/Source/platform/wtf/HashTable.h |
| @@ -836,6 +836,7 @@ class HashTable final |
| // expensive. |
| return key_count_ * kMinLoad < table_size_ && |
| table_size_ > KeyTraits::kMinimumTableSize && |
| + !Allocator::IsObjectResurrectionForbidden() && |
|
sof
2017/04/15 18:57:31
Isn't this redundant (as IsAllocationAllowed() als
keishi
2017/04/17 06:37:55
Oops I modified HeapAllocator::IsAllocationAllowed
|
| Allocator::IsAllocationAllowed(); |
| } |
| ValueType* Expand(ValueType* entry = 0); |
| @@ -1641,6 +1642,7 @@ HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Allocator>:: |
| ExpandBuffer(unsigned new_table_size, Value* entry, bool& success) { |
| success = false; |
| DCHECK_LT(table_size_, new_table_size); |
| + CHECK(!Allocator::IsObjectResurrectionForbidden()); |
| if (!Allocator::ExpandHashTableBacking(table_, |
| new_table_size * sizeof(ValueType))) |
| return nullptr; |