| 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 a732376fe8a4bea0972aa90c8c56e4a4e6ca5f7f..ef6341c0bfb7107c4b31fa439e68cea4091051a1 100644
|
| --- a/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
|
| +++ b/third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h
|
| @@ -41,7 +41,7 @@ protected:
|
| return;
|
|
|
| ASSERT(ThreadState::current()->isInGC());
|
| - ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
|
| + ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
|
|
|
| header->mark();
|
|
|
| @@ -59,22 +59,22 @@ protected:
|
|
|
| inline void registerDelayedMarkNoTracing(const void* objectPointer)
|
| {
|
| - ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
|
| + ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
|
| Heap::pushPostMarkingCallback(const_cast<void*>(objectPointer), &markNoTracingCallback);
|
| }
|
|
|
| inline void registerWeakMembers(const void* closure, const void* objectPointer, WeakCallback callback)
|
| {
|
| - ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
|
| + ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
|
| // We don't want to run weak processings when taking a snapshot.
|
| - if (toDerived()->markingMode() == Visitor::SnapshotMarking)
|
| + if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
|
| return;
|
| Heap::pushThreadLocalWeakCallback(const_cast<void*>(closure), const_cast<void*>(objectPointer), callback);
|
| }
|
|
|
| inline void registerWeakTable(const void* closure, EphemeronCallback iterationCallback, EphemeronCallback iterationDoneCallback)
|
| {
|
| - ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
|
| + ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
|
| Heap::registerWeakTable(const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
|
| }
|
|
|
| @@ -115,9 +115,9 @@ protected:
|
| protected:
|
| inline void registerWeakCellWithCallback(void** cell, WeakCallback callback)
|
| {
|
| - ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
|
| + ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
|
| // We don't want to run weak processings when taking a snapshot.
|
| - if (toDerived()->markingMode() == Visitor::SnapshotMarking)
|
| + if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
|
| return;
|
| Heap::pushGlobalWeakCallback(cell, callback);
|
| }
|
|
|