| 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 407490762ed00e4c5c5456a785ce1be3b7700eee..eba8660706cac430d3c5b9e1193624561e13a5a3 100644
|
| --- a/third_party/WebKit/Source/wtf/Deque.h
|
| +++ b/third_party/WebKit/Source/wtf/Deque.h
|
| @@ -113,9 +113,7 @@ public:
|
| template <typename VisitorDispatcher> void trace(VisitorDispatcher);
|
|
|
| static_assert(!std::is_polymorphic<T>::value || !VectorTraits<T>::canInitializeWithMemset, "Cannot initialize with memset if there is a vtable");
|
| -#if ENABLE(OILPAN)
|
| static_assert(Allocator::isGarbageCollected || !AllowsOnlyPlacementNew<T>::value || !NeedsTracing<T>::value, "Cannot put DISALLOW_NEW_EXCEPT_PLACEMENT_NEW objects that have trace methods into an off-heap Deque");
|
| -#endif
|
| static_assert(Allocator::isGarbageCollected || !IsPointerToGarbageCollectedType<T>::value, "Cannot put raw pointers to garbage-collected classes into a Deque. Use HeapDeque<Member<T>> instead.");
|
|
|
| private:
|
| @@ -620,13 +618,6 @@ inline void swap(Deque<T, inlineCapacity, Allocator>& a, Deque<T, inlineCapacity
|
| a.swap(b);
|
| }
|
|
|
| -#if !ENABLE(OILPAN)
|
| -template <typename T, size_t N>
|
| -struct NeedsTracing<Deque<T, N>> {
|
| - static const bool value = false;
|
| -};
|
| -#endif
|
| -
|
| } // namespace WTF
|
|
|
| using WTF::Deque;
|
|
|