| 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 aad25e7c29840c7cec0016c97746ae89fe419eee..0226200cbabf903b66d2d78a27abc2d85becd42a 100644
|
| --- a/third_party/WebKit/Source/wtf/HashTable.h
|
| +++ b/third_party/WebKit/Source/wtf/HashTable.h
|
| @@ -1005,13 +1005,11 @@ Value* HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits, Alloca
|
| // false for a pair of two types, even if one of the components is
|
| // polymorphic.
|
| static_assert(!Traits::emptyValueIsZero || !std::is_polymorphic<KeyType>::value, "empty value cannot be zero for things with a vtable");
|
| -
|
| -#if ENABLE(OILPAN)
|
| static_assert(Allocator::isGarbageCollected
|
| || ((!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) {
|
| result = Allocator::template allocateZeroedHashTableBacking<ValueType, HashTable>(allocSize);
|
| } else {
|
|
|