| Index: third_party/WebKit/Source/wtf/Vector.h
|
| diff --git a/third_party/WebKit/Source/wtf/Vector.h b/third_party/WebKit/Source/wtf/Vector.h
|
| index c6c0f98f0ad3d7582a7326211121949f43cfe391..38715f662180b3b2b9b728ed807a6d97a705b3b7 100644
|
| --- a/third_party/WebKit/Source/wtf/Vector.h
|
| +++ b/third_party/WebKit/Source/wtf/Vector.h
|
| @@ -777,9 +777,7 @@ public:
|
| Vector()
|
| {
|
| 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 Vector");
|
| -#endif
|
| static_assert(Allocator::isGarbageCollected || !IsPointerToGarbageCollectedType<T>::value, "Cannot put raw pointers to garbage-collected classes into an off-heap Vector. Use HeapVector<Member<T>> instead.");
|
|
|
| ANNOTATE_NEW_BUFFER(begin(), capacity(), 0);
|
| @@ -790,9 +788,7 @@ public:
|
| : Base(size)
|
| {
|
| 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 Vector");
|
| -#endif
|
| static_assert(Allocator::isGarbageCollected || !IsPointerToGarbageCollectedType<T>::value, "Cannot put raw pointers to garbage-collected classes into an off-heap Vector. Use HeapVector<Member<T>> instead.");
|
|
|
| ANNOTATE_NEW_BUFFER(begin(), capacity(), size);
|
| @@ -1502,14 +1498,6 @@ void Vector<T, inlineCapacity, Allocator>::trace(VisitorDispatcher visitor)
|
| }
|
| }
|
|
|
| -#if !ENABLE(OILPAN)
|
| -template <typename T, size_t N>
|
| -struct NeedsTracing<Vector<T, N>> {
|
| - STATIC_ONLY(NeedsTracing);
|
| - static const bool value = false;
|
| -};
|
| -#endif
|
| -
|
| } // namespace WTF
|
|
|
| using WTF::Vector;
|
|
|