commit e178918ecc967b30400b9416b1c788267d2398b5
author ggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu May 26 23:47:40 2011 +0000
committer ggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu May 26 23:47:40 2011 +0000
tree b85f4a5b0d0b823c3a01f7545a6d7c4088399214
parent 1dc34e4a6b8fd187d493aa32ddf7363640276c1e

2011-05-26  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Oliver Hunt.

        Renamed heapRootMarker to heapRootVisitor to match its class name
        https://bugs.webkit.org/show_bug.cgi?id=61584

        * heap/Heap.cpp:
        (JSC::Heap::markProtectedObjects):
        (JSC::Heap::markTempSortVectors):
        (JSC::Heap::markRoots):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/heap/Heap.cpp

diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp
index 577d2cb..5800966 100644
--- a/Source/JavaScriptCore/heap/Heap.cpp
+++ b/Source/JavaScriptCore/heap/Heap.cpp
@@ -175,11 +175,11 @@
     return m_protectedValues.remove(k.asCell());
 }
 
-void Heap::markProtectedObjects(HeapRootVisitor& heapRootMarker)
+void Heap::markProtectedObjects(HeapRootVisitor& heapRootVisitor)
 {
     ProtectCountSet::iterator end = m_protectedValues.end();
     for (ProtectCountSet::iterator it = m_protectedValues.begin(); it != end; ++it)
-        heapRootMarker.mark(&it->first);
+        heapRootVisitor.mark(&it->first);
 }
 
 void Heap::pushTempSortVector(Vector<ValueStringPair>* tempVector)
@@ -193,7 +193,7 @@
     m_tempSortingVectors.removeLast();
 }
     
-void Heap::markTempSortVectors(HeapRootVisitor& heapRootMarker)
+void Heap::markTempSortVectors(HeapRootVisitor& heapRootVisitor)
 {
     typedef Vector<Vector<ValueStringPair>* > VectorOfValueStringVectors;
 
@@ -204,7 +204,7 @@
         Vector<ValueStringPair>::iterator vectorEnd = tempSortingVector->end();
         for (Vector<ValueStringPair>::iterator vectorIt = tempSortingVector->begin(); vectorIt != vectorEnd; ++vectorIt) {
             if (vectorIt->first)
-                heapRootMarker.mark(&vectorIt->first);
+                heapRootVisitor.mark(&vectorIt->first);
         }
     }
 }
@@ -224,7 +224,7 @@
     void* dummy;
 
     MarkStack& visitor = m_markStack;
-    HeapRootVisitor heapRootMarker(visitor);
+    HeapRootVisitor heapRootVisitor(visitor);
 
     // We gather conservative roots before clearing mark bits because conservative
     // gathering uses the mark bits to determine whether a reference is valid.
@@ -242,22 +242,22 @@
     visitor.append(registerFileRoots);
     visitor.drain();
 
-    markProtectedObjects(heapRootMarker);
+    markProtectedObjects(heapRootVisitor);
     visitor.drain();
     
-    markTempSortVectors(heapRootMarker);
+    markTempSortVectors(heapRootVisitor);
     visitor.drain();
 
     if (m_markListSet && m_markListSet->size())
-        MarkedArgumentBuffer::markLists(heapRootMarker, *m_markListSet);
+        MarkedArgumentBuffer::markLists(heapRootVisitor, *m_markListSet);
     if (m_globalData->exception)
-        heapRootMarker.mark(&m_globalData->exception);
+        heapRootVisitor.mark(&m_globalData->exception);
     visitor.drain();
 
-    m_handleHeap.markStrongHandles(heapRootMarker);
+    m_handleHeap.markStrongHandles(heapRootVisitor);
     visitor.drain();
 
-    m_handleStack.mark(heapRootMarker);
+    m_handleStack.mark(heapRootVisitor);
     visitor.drain();
 
     // Weak handles must be marked last, because their owners use the set of
@@ -265,7 +265,7 @@
     int lastOpaqueRootCount;
     do {
         lastOpaqueRootCount = visitor.opaqueRootCount();
-        m_handleHeap.markWeakHandles(heapRootMarker);
+        m_handleHeap.markWeakHandles(heapRootVisitor);
         visitor.drain();
     // If the set of opaque roots has grown, more weak handles may have become reachable.
     } while (lastOpaqueRootCount != visitor.opaqueRootCount());