| Index: Source/platform/heap/Handle.h
|
| diff --git a/Source/platform/heap/Handle.h b/Source/platform/heap/Handle.h
|
| index 7f678b1cb31991f28d02fc0de6b7404ecf942952..8e85ebd711c7ceab95ade6c0848bc981810a4a0d 100644
|
| --- a/Source/platform/heap/Handle.h
|
| +++ b/Source/platform/heap/Handle.h
|
| @@ -976,49 +976,55 @@ public:
|
| template<typename T, typename U, typename V, typename W, typename X>
|
| class TraceEagerlyTrait<HeapHashMap<T, U, V, W, X> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T) || IS_EAGERLY_TRACED_HEAP_COLLECTION(U);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value || TraceEagerlyTrait<U>::value;
|
| };
|
|
|
| template<typename T, typename U, typename V>
|
| class TraceEagerlyTrait<HeapHashSet<T, U, V> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value;
|
| };
|
|
|
| template<typename T, typename U, typename V>
|
| class TraceEagerlyTrait<HeapLinkedHashSet<T, U, V> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value;
|
| };
|
|
|
| template<typename T, size_t inlineCapacity, typename U>
|
| class TraceEagerlyTrait<HeapListHashSet<T, inlineCapacity, U> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value;
|
| +};
|
| +
|
| +template<typename T, size_t inlineCapacity>
|
| +class TraceEagerlyTrait<WTF::ListHashSetNode<T, HeapListHashSetAllocator<T, inlineCapacity>>> {
|
| +public:
|
| + static const bool value = false;
|
| };
|
|
|
| template<typename T, size_t inlineCapacity>
|
| class TraceEagerlyTrait<HeapVector<T, inlineCapacity> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value;
|
| };
|
|
|
| template<typename T, typename U>
|
| class TraceEagerlyTrait<HeapVectorBacking<T, U> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value;
|
| };
|
|
|
| template<typename T, size_t inlineCapacity>
|
| class TraceEagerlyTrait<HeapDeque<T, inlineCapacity> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value;
|
| };
|
|
|
| template<typename T, typename U, typename V>
|
| class TraceEagerlyTrait<HeapHashCountedSet<T, U, V> > {
|
| public:
|
| - static const bool value = IS_EAGERLY_TRACED_HEAP_COLLECTION(T);
|
| + static const bool value = MARKER_EAGER_TRACING || TraceEagerlyTrait<T>::value;
|
| };
|
|
|
| } // namespace blink
|
|
|