Chromium Code Reviews| Index: Source/platform/heap/Handle.h |
| diff --git a/Source/platform/heap/Handle.h b/Source/platform/heap/Handle.h |
| index c8d99ed2c05a8857ea2a447708198b7c1bf29b8b..0e66c6d37b60bbb849034d635b0299c286d55e74 100644 |
| --- a/Source/platform/heap/Handle.h |
| +++ b/Source/platform/heap/Handle.h |
| @@ -986,49 +986,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 = TraceEagerlyTrait<T>::value || TraceEagerlyTrait<U>::value; |
|
Erik Corry
2014/12/09 15:49:02
Can't this just be "true"? We can eagerly trace t
sof
2014/12/09 21:55:37
why not. I've made the enabled flag/setting for th
|
| }; |
| 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 = 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 = 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 = 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 = 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 = 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 = 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 = TraceEagerlyTrait<T>::value; |
| }; |
| } // namespace blink |