Chromium Code Reviews| Index: Source/heap/Handle.h |
| diff --git a/Source/heap/Handle.h b/Source/heap/Handle.h |
| index 2ea4a63ceaa0084e22e07e71dd27b67a0e33524b..ad31ba7c08bb64c421f184497a88c2ae8d2cf600 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; |
|
wibling-chromium
2013/12/05 12:37:17
NIT: Shouldn't this be OffHeapCollectionMarkTrait?
Mads Ager (chromium)
2013/12/05 12:41:17
I found it more fitting to call it a TraceTrait. T
|
| #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::needsMarking, Traits::isWeak, false, T, Traits>::mark(visitor, t); |
| } |
| template<typename T> |
| @@ -1285,7 +1285,7 @@ template<typename T> struct DefaultHash<WebCore::WeakMember<T> > { |
| }; |
| template<typename T> |
| -struct NeedsVisiting<WebCore::Member<T> > { |
| +struct NeedsMarking<WebCore::Member<T> > { |
| static const bool value = true; |
| }; |
| @@ -1300,7 +1300,7 @@ struct IsPod<WebCore::HeapVector<T, inlinedCapacity> > { |
| }; |
| template<typename T, size_t inlinedCapacity> |
| -struct NeedsVisiting<WebCore::HeapVector<T, inlinedCapacity> > { |
| +struct NeedsMarking<WebCore::HeapVector<T, inlinedCapacity> > { |
| static const bool value = true; |
| }; |