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

Timestamp:

Jan 11, 2007, 10:25:15 PM (18 years ago)

Author:

ggaren

Message:

RS by Brady Eidson.

Rolling out r18786 because it caused leaks.

File:

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

trunk/JavaScriptCore/kjs/collector.cpp

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