Changeset 113508 in webkit for trunk/Source/JavaScriptCore/runtime/WeakGCMap.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/runtime/WeakGCMap.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/WeakGCMap.h

@@ -90 +90 @@
         map_iterator end = m_map.end();
         for (map_iterator ptr = m_map.begin(); ptr != end; ++ptr)
-            WeakHeap::deallocate(ptr->second);
+            WeakSet::deallocate(ptr->second);
         m_map.clear();
     }
@@ -109 +109 @@
         WeakImpl* impl = iter.m_iterator->second;
         ASSERT(impl);
-        WeakHeap::deallocate(impl);
+        WeakSet::deallocate(impl);
         m_map.remove(iter.m_iterator);
     }
@@ -122 +122 @@
         typename MapType::AddResult result = m_map.add(key, 0);
         if (result.isNewEntry)
-            result.iterator->second = globalData.heap.weakHeap()->allocate(value, this, FinalizerCallback::finalizerContextFor(key));
+            result.iterator->second = globalData.heap.weakSet()->allocate(value, this, FinalizerCallback::finalizerContextFor(key));
 
         // WeakGCMap exposes a different iterator, so we need to wrap it and create our own AddResult.
@@ -132 +132 @@
         typename MapType::AddResult result = m_map.add(key, 0);
         if (!result.isNewEntry)
-            WeakHeap::deallocate(result.iterator->second);
-        result.iterator->second = globalData.heap.weakHeap()->allocate(value, this, FinalizerCallback::finalizerContextFor(key));
+            WeakSet::deallocate(result.iterator->second);
+        result.iterator->second = globalData.heap.weakSet()->allocate(value, this, FinalizerCallback::finalizerContextFor(key));
     }
 
@@ -142 +142 @@
             return HashTraits<ExternalType>::emptyValue();
         ExternalType result = HandleTypes<MappedType>::getFromSlot(const_cast<JSValue*>(&impl->jsValue()));
-        WeakHeap::deallocate(impl);
+        WeakSet::deallocate(impl);
         return result;
     }
@@ -161 +161 @@
         WeakImpl* impl = m_map.take(FinalizerCallback::keyForFinalizer(context, HandleTypes<MappedType>::getFromSlot(handle.slot())));
         ASSERT(impl);
-        WeakHeap::deallocate(impl);
+        WeakSet::deallocate(impl);
     }