Index: Source/platform/heap/Visitor.h |
diff --git a/Source/platform/heap/Visitor.h b/Source/platform/heap/Visitor.h |
index 09beb987ea988afb963d09c14506b43c0861dd37..d310b8abb45534f21a26af698da45dea0bd16555 100644 |
--- a/Source/platform/heap/Visitor.h |
+++ b/Source/platform/heap/Visitor.h |
@@ -192,7 +192,7 @@ struct OffHeapCollectionTraceTrait; |
template<typename T> |
struct ObjectAliveTrait { |
- static bool isAlive(Visitor*, T*); |
+ static bool isHeapObjectAlive(Visitor*, T*); |
}; |
// Visitor is used to traverse the Blink object graph. Used for the |
@@ -406,7 +406,7 @@ public: |
// always 'alive'. |
if (!obj) |
return true; |
- return ObjectAliveTrait<T>::isAlive(this, obj); |
+ return ObjectAliveTrait<T>::isHeapObjectAlive(this, obj); |
} |
template<typename T> inline bool isAlive(const Member<T>& member) |
{ |
@@ -542,7 +542,7 @@ template<typename T, bool = NeedsAdjustAndMark<T>::value> class DefaultObjectAli |
template<typename T> |
class DefaultObjectAliveTrait<T, false> { |
public: |
- static bool isAlive(Visitor* visitor, T* obj) |
+ static bool isHeapObjectAlive(Visitor* visitor, T* obj) |
{ |
return visitor->isMarked(obj); |
} |
@@ -551,15 +551,15 @@ public: |
template<typename T> |
class DefaultObjectAliveTrait<T, true> { |
public: |
- static bool isAlive(Visitor* visitor, T* obj) |
+ static bool isHeapObjectAlive(Visitor* visitor, T* obj) |
{ |
- return obj->isAlive(visitor); |
+ return obj->isHeapObjectAlive(visitor); |
} |
}; |
-template<typename T> bool ObjectAliveTrait<T>::isAlive(Visitor* visitor, T* obj) |
+template<typename T> bool ObjectAliveTrait<T>::isHeapObjectAlive(Visitor* visitor, T* obj) |
{ |
- return DefaultObjectAliveTrait<T>::isAlive(visitor, obj); |
+ return DefaultObjectAliveTrait<T>::isHeapObjectAlive(visitor, obj); |
} |
// The GarbageCollectedMixin interface and helper macro |
@@ -586,7 +586,7 @@ template<typename T> bool ObjectAliveTrait<T>::isAlive(Visitor* visitor, T* obj) |
class PLATFORM_EXPORT GarbageCollectedMixin { |
public: |
virtual void adjustAndMark(Visitor*) const { }; |
- virtual bool isAlive(Visitor*) const { return true; }; |
+ virtual bool isHeapObjectAlive(Visitor*) const { return true; }; |
virtual void trace(Visitor*) { } |
}; |
@@ -598,7 +598,7 @@ public: \ |
COMPILE_ASSERT(IsSubclassOfGarbageCollected::value, OnlyGarbageCollectedObjectsCanHaveGarbageCollectedMixins); \ |
visitor->mark(static_cast<const TYPE*>(this), &blink::TraceTrait<TYPE>::trace); \ |
} \ |
- virtual bool isAlive(blink::Visitor* visitor) const OVERRIDE \ |
+ virtual bool isHeapObjectAlive(blink::Visitor* visitor) const OVERRIDE \ |
{ \ |
return visitor->isAlive(this); \ |
} \ |