| Index: third_party/WebKit/Source/wtf/HashTable.h
|
| diff --git a/third_party/WebKit/Source/wtf/HashTable.h b/third_party/WebKit/Source/wtf/HashTable.h
|
| index 4ae3653fcd775bfd8cf5500c2a99a5ee2e802c2b..450f957fb7785e8dc1d182e526d958b2797bb786 100644
|
| --- a/third_party/WebKit/Source/wtf/HashTable.h
|
| +++ b/third_party/WebKit/Source/wtf/HashTable.h
|
| @@ -1002,8 +1002,8 @@ Value* HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Alloca
|
|
|
| #if ENABLE(OILPAN)
|
| static_assert(Allocator::isGarbageCollected
|
| - || ((!IsAllowOnlyInlineAllocation<KeyType>::value || !NeedsTracing<KeyType>::value)
|
| - && (!IsAllowOnlyInlineAllocation<ValueType>::value || !NeedsTracing<ValueType>::value))
|
| + || ((!AllowsOnlyPlacementNew<KeyType>::value || !NeedsTracing<KeyType>::value)
|
| + && (!AllowsOnlyPlacementNew<ValueType>::value || !NeedsTracing<ValueType>::value))
|
| , "Cannot put DISALLOW_NEW_EXCEPT_PLACEMENT_NEW objects that have trace methods into an off-heap HashTable");
|
| #endif
|
| if (Traits::emptyValueIsZero) {
|
|
|