| Index: third_party/WebKit/Source/wtf/Deque.h
|
| diff --git a/third_party/WebKit/Source/wtf/Deque.h b/third_party/WebKit/Source/wtf/Deque.h
|
| index 37f5c9e852d09f4b6ca485da38a0b1ffeed47c1c..7d313f48d3ba6a96212f99ec9296e439668b0fa1 100644
|
| --- a/third_party/WebKit/Source/wtf/Deque.h
|
| +++ b/third_party/WebKit/Source/wtf/Deque.h
|
| @@ -228,7 +228,7 @@ inline Deque<T, inlineCapacity, Allocator>::Deque()
|
| {
|
| static_assert(!IsPolymorphic<T>::value || !VectorTraits<T>::canInitializeWithMemset, "Cannot initialize with memset if there is a vtable");
|
| #if ENABLE(OILPAN)
|
| - static_assert(Allocator::isGarbageCollected || !IsAllowOnlyInlineAllocation<T>::value || !NeedsTracing<T>::value, "Cannot put ALLOW_ONLY_INLINE_ALLOCATION objects that have trace methods into an off-heap Deque");
|
| + static_assert(Allocator::isGarbageCollected || !IsAllowOnlyInlineAllocation<T>::value || !NeedsTracing<T>::value, "Cannot put DISALLOW_NEW_EXCEPT_PLACEMENT_NEW objects that have trace methods into an off-heap Deque");
|
| #endif
|
| }
|
|
|
|
|