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

trunk/Source/JavaScriptCore/heap/Strong.h

@@ -29 +29 @@
 #include <wtf/Assertions.h>
 #include "Handle.h"
-#include "HandleHeap.h"
+#include "HandleSet.h"
 
 namespace JSC {
@@ -57 +57 @@
         if (!other.slot())
             return;
-        setSlot(HandleHeap::heapFor(other.slot())->allocate());
+        setSlot(HandleSet::heapFor(other.slot())->allocate());
         set(other.get());
     }
@@ -66 +66 @@
         if (!other.slot())
             return;
-        setSlot(HandleHeap::heapFor(other.slot())->allocate());
+        setSlot(HandleSet::heapFor(other.slot())->allocate());
         set(other.get());
     }
@@ -104 +104 @@
         }
 
-        set(*HandleHeap::heapFor(other.slot())->globalData(), other.get());
+        set(*HandleSet::heapFor(other.slot())->globalData(), other.get());
         return *this;
     }
@@ -115 +115 @@
         }
 
-        set(*HandleHeap::heapFor(other.slot())->globalData(), other.get());
+        set(*HandleSet::heapFor(other.slot())->globalData(), other.get());
         return *this;
     }
@@ -123 +123 @@
         if (!slot())
             return;
-        HandleHeap::heapFor(slot())->deallocate(slot());
+        HandleSet::heapFor(slot())->deallocate(slot());
         setSlot(0);
     }
@@ -134 +134 @@
         ASSERT(slot());
         JSValue value = HandleTypes<T>::toJSValue(externalType);
-        HandleHeap::heapFor(slot())->writeBarrier(slot(), value);
+        HandleSet::heapFor(slot())->writeBarrier(slot(), value);
         *slot() = value;
     }