Changeset 49955 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Oct 22, 2009, 1:33:16 PM (16 years ago)

Author:

[email protected]

Message:

Fixed ASSERT when opening Safari's Caches window while the Web Inspector
is open.

Patch by Geoffrey Garen <​[email protected]> on 2009-10-22
Reviewed by Alexey Proskuryakov.

• runtime/Collector.cpp:

(JSC::typeName): Added two new types to the type name list in the Collector.
These types have been around for a while, but nobody remembered to consider them here.

• runtime/JSCell.h:

(JSC::JSCell::isPropertyNameIterator):

• runtime/JSPropertyNameIterator.h:

(JSC::JSPropertyNameIterator::isPropertyNameIterator): Give the Collector
a way to tell if a cell is a JSPropertyNameIterator.

Location:

trunk/JavaScriptCore/runtime

Files:

• Collector.cpp (modified) (1 diff)
• JSCell.h (modified) (1 diff)
• JSPropertyNameIterator.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -1229 +1229 @@
     if (cell->isGetterSetter())
         return "gettersetter";
+    if (cell->isAPIValueWrapper())
+        return "value wrapper";
+    if (cell->isPropertyNameIterator())
+        return "for-in iterator";
     ASSERT(cell->isObject());
     const ClassInfo* info = cell->classInfo();

trunk/JavaScriptCore/runtime/JSCell.h

@@ -60 +60 @@
         bool inherits(const ClassInfo*) const;
         virtual bool isAPIValueWrapper() const { return false; }
+        virtual bool isPropertyNameIterator() const { return false; }
 
         Structure* structure() const;

trunk/JavaScriptCore/runtime/JSPropertyNameIterator.h

@@ -51 +51 @@
         }
 
+        virtual bool isPropertyNameIterator() const { return true; }
+
         virtual void markChildren(MarkStack&);