Changeset 18811 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Jan 12, 2007, 1:11:22 PM (18 years ago)

Author:

ggaren

Message:

RS by Brady Eidson.

Rolling back in r18786 with leaks fixed, and these renames slightly reworked:

Because they can return 0:
rootObjectForImp => findRootObject (overloaded for JSObject* and Interpreter*)
rootObjectForInterpreter => findRootObject (ditto)
findReferenceSet => findProtectCountSet

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -418 +418 @@
 }
 
-typedef HashCountedSet<JSCell *> ProtectCounts;
-
-static ProtectCounts& protectedValues()
-{
-    static ProtectCounts pv;
-    return pv;
+typedef HashCountedSet<JSCell*> ProtectCountSet;
+
+static ProtectCountSet& protectedValues()
+{
+    static ProtectCountSet staticProtectCountSet;
+    return staticProtectCountSet;
 }
 
@@ -450 +450 @@
 void Collector::markProtectedObjects()
 {
-  ProtectCounts& pv = protectedValues();
-  ProtectCounts::iterator end = pv.end();
-  for (ProtectCounts::iterator it = pv.begin(); it != end; ++it) {
+  ProtectCountSet& protectedValues = KJS::protectedValues();
+  ProtectCountSet::iterator end = protectedValues.end();
+  for (ProtectCountSet::iterator it = protectedValues.begin(); it != end; ++it) {
     JSCell *val = it->first;
     if (!val->marked())
@@ -670 +670 @@
     HashCountedSet<const char*>* counts = new HashCountedSet<const char*>;
 
-    ProtectCounts& pv = protectedValues();
-    ProtectCounts::iterator end = pv.end();
-    for (ProtectCounts::iterator it = pv.begin(); it != end; ++it)
+    ProtectCountSet& protectedValues = KJS::protectedValues();
+    ProtectCountSet::iterator end = protectedValues.end();
+    for (ProtectCountSet::iterator it = protectedValues.begin(); it != end; ++it)
         counts->add(typeName(it->first));