Changeset 36125 in webkit for trunk/JavaScriptCore/VM/JSPropertyNameIterator.h

Timestamp:

Sep 5, 2008, 9:59:53 PM (17 years ago)

Author:

Darin Adler

Message:

2008-09-05 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

• ​https://bugs.webkit.org/show_bug.cgi?id=20681 JSPropertyNameIterator functions need to be inlined

1.007x as fast on SunSpider overall
1.081x as fast on SunSpider math-cordic

• VM/JSPropertyNameIterator.cpp: Moved functions out of here.
• VM/JSPropertyNameIterator.h: (KJS::JSPropertyNameIterator::JSPropertyNameIterator): Moved this into the header and marked it inline. (KJS::JSPropertyNameIterator::create): Ditto. (KJS::JSPropertyNameIterator::next): Ditto.

File:

• trunk/JavaScriptCore/VM/JSPropertyNameIterator.h (modified) (2 diffs)

trunk/JavaScriptCore/VM/JSPropertyNameIterator.h

@@ -30 +30 @@
 #define JSPropertyNameIterator_h
 
-#include "JSCell.h"
+#include "JSObject.h"
+#include "JSString.h"
+#include "PropertyNameArray.h"
 
 namespace KJS {
@@ -64 +66 @@
     };
 
+inline JSPropertyNameIterator::JSPropertyNameIterator(JSObject* object, Identifier* propertyNames, size_t numProperties)
+    : m_object(object)
+    , m_propertyNames(propertyNames)
+    , m_position(propertyNames)
+    , m_end(propertyNames + numProperties)
+{
+}
+
+inline JSPropertyNameIterator* JSPropertyNameIterator::create(ExecState* exec, JSValue* v)
+{
+    if (v->isUndefinedOrNull())
+        return new (exec) JSPropertyNameIterator(0, 0, 0);
+
+    JSObject* o = v->toObject(exec);
+    PropertyNameArray propertyNames(exec);
+    o->getPropertyNames(exec, propertyNames);
+    size_t numProperties = propertyNames.size();
+    return new (exec) JSPropertyNameIterator(o, propertyNames.releaseIdentifiers(), numProperties);
+}
+
+inline JSValue* JSPropertyNameIterator::next(ExecState* exec)
+{
+    while (m_position != m_end) {
+        if (m_object->hasProperty(exec, *m_position))
+            return jsOwnedString(exec, (*m_position++).ustring());
+        m_position++;
+    }
+    invalidate();
+    return 0;
+}
+
 } // namespace KJS