| Index: third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h b/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
|
| index cc320a7fc2db636f54c28399767aad7b14efa8c3..76c5519813545e37d9563a6086d7a62a0582ce2c 100644
|
| --- a/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
|
| +++ b/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
|
| @@ -44,7 +44,7 @@ protected:
|
| header->mark();
|
|
|
| if (callback)
|
| - Heap::pushTraceCallback(const_cast<void*>(objectPointer), callback);
|
| + ThreadHeap::pushTraceCallback(const_cast<void*>(objectPointer), callback);
|
| }
|
|
|
| inline void mark(const void* objectPointer, TraceCallback callback)
|
| @@ -58,7 +58,7 @@ protected:
|
| inline void registerDelayedMarkNoTracing(const void* objectPointer)
|
| {
|
| ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
|
| - Heap::pushPostMarkingCallback(const_cast<void*>(objectPointer), &markNoTracingCallback);
|
| + ThreadHeap::pushPostMarkingCallback(const_cast<void*>(objectPointer), &markNoTracingCallback);
|
| }
|
|
|
| inline void registerWeakMembers(const void* closure, const void* objectPointer, WeakCallback callback)
|
| @@ -67,19 +67,19 @@ protected:
|
| // We don't want to run weak processings when taking a snapshot.
|
| if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
|
| return;
|
| - Heap::pushThreadLocalWeakCallback(const_cast<void*>(closure), const_cast<void*>(objectPointer), callback);
|
| + ThreadHeap::pushThreadLocalWeakCallback(const_cast<void*>(closure), const_cast<void*>(objectPointer), callback);
|
| }
|
|
|
| inline void registerWeakTable(const void* closure, EphemeronCallback iterationCallback, EphemeronCallback iterationDoneCallback)
|
| {
|
| ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
|
| - Heap::registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
|
| + ThreadHeap::registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
|
| }
|
|
|
| #if ENABLE(ASSERT)
|
| inline bool weakTableRegistered(const void* closure)
|
| {
|
| - return Heap::weakTableRegistered(closure);
|
| + return ThreadHeap::weakTableRegistered(closure);
|
| }
|
| #endif
|
|
|
| @@ -117,7 +117,7 @@ protected:
|
| // We don't want to run weak processings when taking a snapshot.
|
| if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
|
| return;
|
| - Heap::pushGlobalWeakCallback(cell, callback);
|
| + ThreadHeap::pushGlobalWeakCallback(cell, callback);
|
| }
|
|
|
| private:
|
|
|