Changeset 49726 in webkit for trunk/JavaScriptCore/runtime/JSPropertyNameIterator.h

Timestamp:

Oct 16, 2009, 7:31:42 PM (16 years ago)

Author:

[email protected]

Message:

Roll out r49717 as it broke the build.

File:

• trunk/JavaScriptCore/runtime/JSPropertyNameIterator.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/JSPropertyNameIterator.h

@@ -32 +32 @@
 #include "JSObject.h"
 #include "JSString.h"
-#include "Operations.h"
 #include "PropertyNameArray.h"
 
@@ -41 +40 @@
 
     class JSPropertyNameIterator : public JSCell {
-        friend class JIT;
+    public:
+        static JSPropertyNameIterator* create(ExecState*, JSValue);
 
-    public:
-        static JSPropertyNameIterator* create(ExecState*, JSObject*);
+        virtual ~JSPropertyNameIterator();
+
+        virtual void markChildren(MarkStack&);
+
+        JSValue next(ExecState*);
+        void invalidate();
         
         static PassRefPtr<Structure> createStructure(JSValue prototype)
@@ -50 +54 @@
             return Structure::create(prototype, TypeInfo(CompoundType, OverridesMarkChildren));
         }
+    private:
+        JSPropertyNameIterator(ExecState*);
+        JSPropertyNameIterator(ExecState*, JSObject*, PassRefPtr<PropertyNameArrayData> propertyNameArrayData);
 
-        virtual void markChildren(MarkStack&);
-
-        JSValue get(ExecState*, JSObject*, size_t i);
-        size_t size() { return m_jsStringsSize; }
-
-        void setCachedStructure(Structure* structure) { m_cachedStructure = structure; }
-        Structure* cachedStructure() { return m_cachedStructure; }
-
-        void setCachedPrototypeChain(NonNullPassRefPtr<StructureChain> cachedPrototypeChain) { m_cachedPrototypeChain = cachedPrototypeChain; }
-        StructureChain* cachedPrototypeChain() { return m_cachedPrototypeChain.get(); }
-
-    private:
-        JSPropertyNameIterator(ExecState*, PropertyNameArrayData* propertyNameArrayData);
-
-        Structure* m_cachedStructure;
-        RefPtr<StructureChain> m_cachedPrototypeChain;
-        size_t m_jsStringsSize;
-        OwnArrayPtr<JSValue> m_jsStrings;
+        JSObject* m_object;
+        RefPtr<PropertyNameArrayData> m_data;
+        PropertyNameArrayData::const_iterator m_position;
+        PropertyNameArrayData::const_iterator m_end;
     };
 
-inline JSPropertyNameIterator::JSPropertyNameIterator(ExecState* exec, PropertyNameArrayData* propertyNameArrayData)
+inline JSPropertyNameIterator::JSPropertyNameIterator(ExecState* exec)
     : JSCell(exec->globalData().propertyNameIteratorStructure.get())
-    , m_cachedStructure(0)
-    , m_jsStringsSize(propertyNameArrayData->propertyNameVector().size())
-    , m_jsStrings(new JSValue[m_jsStringsSize])
+    , m_object(0)
+    , m_position(0)
+    , m_end(0)
 {
-    PropertyNameArrayData::PropertyNameVector& propertyNameVector = propertyNameArrayData->propertyNameVector();
-    for (size_t i = 0; i < m_jsStringsSize; ++i)
-        m_jsStrings[i] = jsOwnedString(exec, propertyNameVector[i].ustring());
 }
 
-inline void Structure::setEnumerationCache(JSPropertyNameIterator* enumerationCache)
+inline JSPropertyNameIterator::JSPropertyNameIterator(ExecState* exec, JSObject* object, PassRefPtr<PropertyNameArrayData> propertyNameArrayData)
+    : JSCell(exec->globalData().propertyNameIteratorStructure.get())
+    , m_object(object)
+    , m_data(propertyNameArrayData)
+    , m_position(m_data->begin())
+    , m_end(m_data->end())
 {
-    ASSERT(!isDictionary());
-    m_enumerationCache = enumerationCache;
+}
+
+inline JSPropertyNameIterator* JSPropertyNameIterator::create(ExecState* exec, JSValue v)
+{
+    if (v.isUndefinedOrNull())
+        return new (exec) JSPropertyNameIterator(exec);
+
+    JSObject* o = v.toObject(exec);
+    PropertyNameArray propertyNames(exec);
+    o->getPropertyNames(exec, propertyNames);
+    return new (exec) JSPropertyNameIterator(exec, o, propertyNames.releaseData());
+}
+
+inline JSValue JSPropertyNameIterator::next(ExecState* exec)
+{
+    if (m_position == m_end)
+        return JSValue();
+
+    if (m_data->cachedStructure() == m_object->structure() && m_data->cachedPrototypeChain() == m_object->structure()->prototypeChain(exec))
+        return jsOwnedString(exec, (*m_position++).ustring());
+
+    do {
+        if (m_object->hasProperty(exec, *m_position))
+            return jsOwnedString(exec, (*m_position++).ustring());
+        m_position++;
+    } while (m_position != m_end);
+
+    return JSValue();
 }