Simplify visitor marking mode tracking.

third_party/WebKit/Source/platform/heap/MarkingVisitorImpl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MarkingVisitorImpl_h
 #define MarkingVisitorImpl_h
 
 #include "platform/heap/Heap.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/heap/Visitor.h"
@@ skipping 17 matching lines @@
     // the dangling pointer.
     // Release builds don't have the ASSERT, but it is OK because
     // release builds will crash in the following header->isMarked()
     // because all the entries of the orphaned arenas are zapped.
     ASSERT(!pageFromObject(objectPointer)->orphaned());
 
     if (header->isMarked())
       return;
 
     ASSERT(ThreadState::current()->isInGC());
-    ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
+    DCHECK(toDerived()->getMarkingMode() != VisitorMarkingMode::WeakProcessing);
 
     // A GC should only mark the objects that belong in its heap.
     DCHECK(&pageFromObject(objectPointer)->arena()->getThreadState()->heap() ==
            &toDerived()->heap());
 
     header->mark();
 
     if (callback)
       toDerived()->heap().pushTraceCallback(const_cast<void*>(objectPointer),
                                             callback);
   }
 
   inline void mark(const void* objectPointer, TraceCallback callback) {
     if (!objectPointer)
       return;
     HeapObjectHeader* header = HeapObjectHeader::fromPayload(objectPointer);
     markHeader(header, header->payload(), callback);
   }
 
   inline void registerDelayedMarkNoTracing(const void* objectPointer) {
-    ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
+    DCHECK(toDerived()->getMarkingMode() != VisitorMarkingMode::WeakProcessing);
     toDerived()->heap().pushPostMarkingCallback(
         const_cast<void*>(objectPointer), &markNoTracingCallback);
   }
 
   inline void registerWeakMembers(const void* closure,
                                   const void* objectPointer,
                                   WeakCallback callback) {
-    ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
+    DCHECK(toDerived()->getMarkingMode() != VisitorMarkingMode::WeakProcessing);
     // We don't want to run weak processings when taking a snapshot.
-    if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
+    if (toDerived()->getMarkingMode() == VisitorMarkingMode::SnapshotMarking)
       return;
     toDerived()->heap().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);
+    DCHECK(toDerived()->getMarkingMode() != VisitorMarkingMode::WeakProcessing);
     toDerived()->heap().registerWeakTable(
         const_cast<void*>(closure), iterationCallback, iterationDoneCallback);
   }
 
 #if ENABLE(ASSERT)
   inline bool weakTableRegistered(const void* closure) {
     return toDerived()->heap().weakTableRegistered(closure);
   }
 #endif
 
   inline void registerMovingObjectReference(MovableReference* slot) {
-    if (toDerived()->getMarkingMode() != Visitor::GlobalMarkingWithCompaction)
+    if (toDerived()->getMarkingMode() !=
+        VisitorMarkingMode::GlobalMarkingWithCompaction)
       return;
     toDerived()->heap().registerMovingObjectReference(slot);
   }
 
   inline void registerMovingObjectCallback(MovableReference reference,
                                            MovingObjectCallback callback,
                                            void* callbackData) {
-    if (toDerived()->getMarkingMode() != Visitor::GlobalMarkingWithCompaction)
+    if (toDerived()->getMarkingMode() !=
+        VisitorMarkingMode::GlobalMarkingWithCompaction)
       return;
     toDerived()->heap().registerMovingObjectCallback(reference, callback,
                                                      callbackData);
   }
 
   inline bool ensureMarked(const void* objectPointer) {
     if (!objectPointer)
       return false;
 
     HeapObjectHeader* header = HeapObjectHeader::fromPayload(objectPointer);
     if (header->isMarked())
       return false;
 #if ENABLE(ASSERT)
     toDerived()->markNoTracing(objectPointer);
 #else
     // Inline what the above markNoTracing() call expands to,
     // so as to make sure that we do get all the benefits (asserts excepted.)
     header->mark();
 #endif
     return true;
   }
 
   inline void registerWeakCellWithCallback(void** cell, WeakCallback callback) {
-    ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
+    DCHECK(toDerived()->getMarkingMode() != VisitorMarkingMode::WeakProcessing);
     // We don't want to run weak processings when taking a snapshot.
-    if (toDerived()->getMarkingMode() == Visitor::SnapshotMarking)
+    if (toDerived()->getMarkingMode() == VisitorMarkingMode::SnapshotMarking)
       return;
     toDerived()->heap().pushGlobalWeakCallback(cell, callback);
   }
 
   Derived* toDerived() { return static_cast<Derived*>(this); }
 
  private:
   static void markNoTracingCallback(Visitor* visitor, void* object) {
     visitor->markNoTracing(object);
   }
 };
 
 }  // namespace blink
 
 #endif