Rename enums/functions that collide in chromium style in platform/

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 23 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 heaps are zapped.
         ASSERT(!pageFromObject(objectPointer)->orphaned());
 
         if (header->isMarked())
             return;
 
         ASSERT(ThreadState::current()->isInGC());
-        ASSERT(toDerived()->markingMode() != Visitor::WeakProcessing);
+        ASSERT(toDerived()->getMarkingMode() != Visitor::WeakProcessing);
 
         header->mark();
 
         if (callback)
             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()->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);
     }
 
 #if ENABLE(ASSERT)
     inline bool weakTableRegistered(const void* closure)
     {
         return Heap::weakTableRegistered(closure);
     }
 #endif
 
@@ skipping 20 matching lines @@
     }
 
     Derived* toDerived()
     {
         return static_cast<Derived*>(this);
     }
 
 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);
     }
 
 private:
     static void markNoTracingCallback(Visitor* visitor, void* object)
     {
         visitor->markNoTracing(object);
     }
 };
 
 } // namespace blink
 
 #endif