Index: Source/wtf/Vector.h |
diff --git a/Source/wtf/Vector.h b/Source/wtf/Vector.h |
index 657a49b836afa97c17585846be6c0ee7cec0323e..d8765c2f304009f0f487dce55fd40d6c7e26d315 100644 |
--- a/Source/wtf/Vector.h |
+++ b/Source/wtf/Vector.h |
@@ -576,7 +576,7 @@ namespace WTF { |
void clearUnusedSlots(T* from, T* to) |
{ |
- VectorUnusedSlotClearer<Allocator::heapAllocation && (VectorTraits<T>::needsDestruction || VectorTraits<T>::needsVisiting || VectorTraits<T>::isWeak), T>::clear(from, to); |
+ VectorUnusedSlotClearer<Allocator::heapAllocation && (VectorTraits<T>::needsDestruction || VectorTraits<T>::needsTracing || VectorTraits<T>::isWeak), T>::clear(from, to); |
} |
Vector(const Vector&); |
@@ -1235,15 +1235,15 @@ namespace WTF { |
#endif |
// This is only called if the allocator is a HeapAllocator. It is used when |
- // visiting during a tracing GC. |
+ // tracing during a garbage collection. |
template<typename T, size_t inlineCapacity, typename Allocator> |
void Vector<T, inlineCapacity, Allocator>::trace(typename Allocator::Visitor* visitor) |
{ |
const T* bufferBegin = buffer(); |
const T* bufferEnd = buffer() + size(); |
- if (VectorTraits<T>::needsVisiting) { |
+ if (VectorTraits<T>::needsTracing) { |
for (const T* bufferEntry = bufferBegin; bufferEntry != bufferEnd; bufferEntry++) |
- Allocator::template visitWith<T, VectorTraits<T> >(visitor, *const_cast<T*>(bufferEntry)); |
+ Allocator::template adjustAndMark<T, VectorTraits<T> >(visitor, *const_cast<T*>(bufferEntry)); |
} |
if (this->hasOutOfLineBuffer()) |
Allocator::visitHeapPointer(visitor, buffer()); |