| Index: third_party/WebKit/Source/platform/wtf/Deque.h
|
| diff --git a/third_party/WebKit/Source/platform/wtf/Deque.h b/third_party/WebKit/Source/platform/wtf/Deque.h
|
| index b48b6812bf730bb84d2431934c5fd2ae51ce8eb4..4cd275297e71cbfd94c94259e573571822719ce8 100644
|
| --- a/third_party/WebKit/Source/platform/wtf/Deque.h
|
| +++ b/third_party/WebKit/Source/platform/wtf/Deque.h
|
| @@ -150,8 +150,7 @@ class Deque : public ConditionalDestructor<Deque<T, INLINE_CAPACITY, Allocator>,
|
| !VectorTraits<T>::kCanInitializeWithMemset,
|
| "Cannot initialize with memset if there is a vtable");
|
| static_assert(Allocator::kIsGarbageCollected ||
|
| - !AllowsOnlyPlacementNew<T>::value ||
|
| - !IsTraceable<T>::value,
|
| + !AllowsOnlyPlacementNew<T>::value || !IsTraceable<T>::value,
|
| "Cannot put DISALLOW_NEW_EXCEPT_PLACEMENT_NEW objects that "
|
| "have trace methods into an off-heap Deque");
|
| static_assert(Allocator::kIsGarbageCollected ||
|
|
|