Changeset 113508 in webkit for trunk/Source/JavaScriptCore/heap/Heap.h

Timestamp:

Apr 6, 2012, 3:35:55 PM (13 years ago)

Author:

[email protected]

Message:

Renamed

WeakHeap => WeakSet
HandleHeap => HandleSet

Reviewed by Sam Weinig.

These sets do have internal allocators, but it's confusing to call them
heaps because they're sub-objects of an object called "heap".

• heap/HandleHeap.cpp: Removed.
• heap/HandleHeap.h: Removed.
• heap/HandleSet.cpp: Copied from JavaScriptCore/heap/HandleHeap.cpp.
• heap/WeakHeap.cpp: Removed.
• heap/WeakHeap.h: Removed.
• heap/WeakSet.cpp: Copied from JavaScriptCore/heap/WeakHeap.cpp.
• heap/WeakSet.h: Copied from JavaScriptCore/heap/WeakHeap.h.

Plus global rename using grep.

File:

• trunk/Source/JavaScriptCore/heap/Heap.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -24 +24 @@
 
 #include "DFGCodeBlocks.h"
-#include "HandleHeap.h"
+#include "HandleSet.h"
 #include "HandleStack.h"
 #include "MarkedAllocator.h"
@@ -32 +32 @@
 #include "SlotVisitor.h"
 #include "WeakHandleOwner.h"
-#include "WeakHeap.h"
+#include "WeakSet.h"
 #include "WriteBarrierSupport.h"
 #include <wtf/DoublyLinkedList.h>
@@ -139 +139 @@
         template<typename Functor> typename Functor::ReturnType forEachProtectedCell();
 
-        WeakHeap* weakHeap() { return &m_weakHeap; }
-        HandleHeap* handleHeap() { return &m_handleHeap; }
+        WeakSet* weakSet() { return &m_weakSet; }
+        HandleSet* handleSet() { return &m_handleSet; }
         HandleStack* handleStack() { return &m_handleStack; }
 
@@ -238 +238 @@
         SlotVisitor m_slotVisitor;
 
-        WeakHeap m_weakHeap;
-        HandleHeap m_handleHeap;
+        WeakSet m_weakSet;
+        HandleSet m_handleSet;
         HandleStack m_handleStack;
         DFGCodeBlocks m_dfgCodeBlocks;
@@ -356 +356 @@
         for (ProtectCountSet::iterator it = m_protectedValues.begin(); it != end; ++it)
             functor(it->first);
-        m_handleHeap.forEachStrongHandle(functor, m_protectedValues);
+        m_handleSet.forEachStrongHandle(functor, m_protectedValues);
 
         return functor.returnValue();