| Index: Source/heap/Handle.h
|
| diff --git a/Source/heap/Handle.h b/Source/heap/Handle.h
|
| index 131278915a5e536391bceb53fafd0d5613cfee72..6615d8e926e5145a0680459e0f8c34581f7aed7b 100644
|
| --- a/Source/heap/Handle.h
|
| +++ b/Source/heap/Handle.h
|
| @@ -60,7 +60,7 @@ namespace WebCore {
|
| template<typename T> class Member;
|
| template<typename T> class WeakMember;
|
| template<typename T> struct HeapObjectHash;
|
| -template<typename T> struct CollectionVisitingTrait;
|
| +template<typename T> struct OffHeapCollectionTraceTrait;
|
|
|
| #if defined(TRACE_GC_MARKING) && TRACE_GC_MARKING
|
| // To print root names during marking for CollectionPersistent and Persistent handles
|
| @@ -286,7 +286,7 @@ public:
|
| return static_cast<U*>(m_raw);
|
| }
|
|
|
| - void trace(Visitor* visitor) { visitor->visit(m_raw); }
|
| + void trace(Visitor* visitor) { visitor->mark(m_raw); }
|
|
|
| T* clear()
|
| {
|
| @@ -495,7 +495,7 @@ class TraceTrait<Member<T> > {
|
| public:
|
| static void trace(Visitor* visitor, void* self)
|
| {
|
| - TraceTrait<T>::visit(visitor, static_cast<Member<T>*>(self)->raw());
|
| + TraceTrait<T>::mark(visitor, static_cast<Member<T>*>(self)->raw());
|
| }
|
| };
|
|
|
| @@ -597,7 +597,7 @@ public:
|
|
|
| void trace(Visitor* visitor)
|
| {
|
| - CollectionVisitingTrait<Collection>::visit(visitor, m_collection);
|
| + OffHeapCollectionTraceTrait<Collection>::mark(visitor, m_collection);
|
| }
|
|
|
| #if defined(TRACE_GC_MARKING) && TRACE_GC_MARKING
|
| @@ -717,18 +717,18 @@ public:
|
|
|
| static void visitHeapPointer(Visitor* visitor, const void* buffer)
|
| {
|
| - visitor->visit(buffer, FinalizedHeapObjectHeader::fromPayload(buffer)->traceCallback());
|
| + visitor->mark(buffer, FinalizedHeapObjectHeader::fromPayload(buffer)->traceCallback());
|
| }
|
|
|
| - static void visitWith(Visitor* visitor, const void* t)
|
| + static void adjustAndMark(Visitor* visitor, const void* t)
|
| {
|
| - visitor->visit(t);
|
| + visitor->mark(t);
|
| }
|
|
|
| template<typename T, typename Traits>
|
| - static void visitWith(Visitor* visitor, T& t)
|
| + static void adjustAndMark(Visitor* visitor, T& t)
|
| {
|
| - VisitCollectionBackingTrait<Traits::needsVisiting, Traits::isWeak, false, T, Traits>::visit(visitor, t);
|
| + CollectionBackingTraceTrait<Traits::needsTracing, Traits::isWeak, false, T, Traits>::mark(visitor, t);
|
| }
|
|
|
| template<typename T>
|
| @@ -1280,7 +1280,7 @@ template<typename T> struct DefaultHash<WebCore::WeakMember<T> > {
|
| };
|
|
|
| template<typename T>
|
| -struct NeedsVisiting<WebCore::Member<T> > {
|
| +struct NeedsTracing<WebCore::Member<T> > {
|
| static const bool value = true;
|
| };
|
|
|
| @@ -1295,7 +1295,7 @@ struct IsPod<WebCore::HeapVector<T, inlinedCapacity> > {
|
| };
|
|
|
| template<typename T, size_t inlinedCapacity>
|
| -struct NeedsVisiting<WebCore::HeapVector<T, inlinedCapacity> > {
|
| +struct NeedsTracing<WebCore::HeapVector<T, inlinedCapacity> > {
|
| static const bool value = true;
|
| };
|
|
|
|
|