Changeset 55397 in webkit for trunk/JavaScriptCore/runtime/PropertySlot.h

Timestamp:

Mar 1, 2010, 8:08:22 PM (15 years ago)

Author:

[email protected]

Message:

2010-03-01 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

PropertySlot::getValue(ExecState, unsigned) unnecessarily converts index to an Identifier
​https://bugs.webkit.org/show_bug.cgi?id=35561

Fix this by defining a separate property getter function for index getters. This allows
us to pass an unsigned number without the conversion to an Identifier. We then update
setCustomIndex to take this new getter type.

• runtime/PropertySlot.h: (JSC::PropertySlot::getValue): (JSC::PropertySlot::setCustom): (JSC::PropertySlot::setCustomIndex):

2010-03-01 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

PropertySlot::getValue(ExecState, unsigned) unnecessarily converts index to an Identifier
​https://bugs.webkit.org/show_bug.cgi?id=35561

Update bindings generation and the few manual indexing getters we have to use
the new PropertySlot API.

• bindings/js/JSDOMWindowCustom.cpp: (WebCore::indexGetter):
• bindings/scripts/CodeGeneratorJS.pm:
• bridge/runtime_array.cpp: (JSC::RuntimeArray::indexGetter):
• bridge/runtime_array.h:

File:

• trunk/JavaScriptCore/runtime/PropertySlot.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/PropertySlot.h

@@ -35 +35 @@
 #define JSC_VALUE_SLOT_MARKER 0
 #define JSC_REGISTER_SLOT_MARKER reinterpret_cast<GetValueFunc>(1)
+#define INDEX_GETTER_MARKER reinterpret_cast<GetValueFunc>(2)
 
     class PropertySlot {
@@ -53 +54 @@
 
         typedef JSValue (*GetValueFunc)(ExecState*, const Identifier&, const PropertySlot&);
+        typedef JSValue (*GetIndexValueFunc)(ExecState*, JSValue slotBase, unsigned);
 
         JSValue getValue(ExecState* exec, const Identifier& propertyName) const
@@ -60 +62 @@
             if (m_getValue == JSC_REGISTER_SLOT_MARKER)
                 return (*m_data.registerSlot).jsValue();
+            if (m_getValue == INDEX_GETTER_MARKER)
+                return m_getIndexValue(exec, slotBase(), index());
             return m_getValue(exec, propertyName, *this);
         }
@@ -69 +73 @@
             if (m_getValue == JSC_REGISTER_SLOT_MARKER)
                 return (*m_data.registerSlot).jsValue();
+            if (m_getValue == INDEX_GETTER_MARKER)
+                return m_getIndexValue(exec, m_slotBase, m_data.index);
             return m_getValue(exec, Identifier::from(exec, propertyName), *this);
         }
@@ -133 +139 @@
             ASSERT(getValue);
             m_getValue = getValue;
-            m_slotBase = slotBase;
-        }
-
-        void setCustomIndex(JSValue slotBase, unsigned index, GetValueFunc getValue)
+            m_getIndexValue = 0;
+            m_slotBase = slotBase;
+        }
+
+        void setCustomIndex(JSValue slotBase, unsigned index, GetIndexValueFunc getIndexValue)
         {
             ASSERT(slotBase);
-            ASSERT(getValue);
-            m_getValue = getValue;
+            ASSERT(getIndexValue);
+            m_getValue = INDEX_GETTER_MARKER;
+            m_getIndexValue = getIndexValue;
             m_slotBase = slotBase;
             m_data.index = index;
@@ -213 +221 @@
 
         GetValueFunc m_getValue;
+        GetIndexValueFunc m_getIndexValue;
         
         JSValue m_slotBase;