Changeset 440 for trunk/JavaScriptCore/kjs/PropertySlot.h

Timestamp:

08/18/08 11:14:49 (5 months ago)

Author:

odole

Message:

merge with webkit revision 35814

Files:

• trunk/JavaScriptCore/kjs/PropertySlot.h (modified) (10 diffs)

trunk/JavaScriptCore/kjs/PropertySlot.h

@@ -35 +35 @@
-#define KJS_VALUE_SLOT_MARKER 0
-#define KJS_REGISTER_SLOT_MARKER reinterpret_cast<GetValueFunc>(1)
-#define KJS_NUMERIC_PROPERTY_NAME_SLOT_MARKER reinterpret_cast<GetValueFunc>(2)
-
-    class PropertySlot {
@@ -42 +41 @@
-        {
-            clearBase();
+            clearValue();
-        }
-
@@ -47 +47 @@
-            : m_slotBase(base)
-        {
+            clearValue();
-        }
-
-        typedef JSValue* (*GetValueFunc)(ExecState*, const Identifier&, const PropertySlot&);
-        typedef JSValue* (*GetValueNumericFunc)(ExecState*, unsigned index, const PropertySlot&);
-
-        JSValue* getValue(ExecState* exec, const Identifier& propertyName) const
@@ -58 +58 @@
-            if (m_getValue == KJS_REGISTER_SLOT_MARKER)
-                return (*m_data.registerSlot).jsValue(exec);
-            ASSERT(m_getValue != KJS_NUMERIC_PROPERTY_NAME_SLOT_MARKER);
-            return m_getValue(exec, propertyName, *this);
-        }
@@ -66 +65 @@
-            if (m_getValue == KJS_VALUE_SLOT_MARKER)
-                return *m_data.valueSlot;
-            if (m_getValue == KJS_NUMERIC_PROPERTY_NAME_SLOT_MARKER)
-                return m_data.numericFunc(exec, propertyName, *this);
-            if (m_getValue == KJS_REGISTER_SLOT_MARKER)
-                return (*m_data.registerSlot).jsValue(exec);
@@ -91 +88 @@
-        }
-        
+        void setValue(JSValue* value)
+        {
+            ASSERT(value);
+            m_getValue = KJS_VALUE_SLOT_MARKER;
+            clearBase();
+            m_value = value;
+            m_data.valueSlot = &m_value;
+        }
+
-        void setRegisterSlot(Register* registerSlot)
-        {
@@ -126 +132 @@
-        }
-        
-        void setCustomNumeric(JSValue* slotBase, GetValueNumericFunc getValue)
-        {
-            ASSERT(slotBase);
-            ASSERT(getValue);
-            m_slotBase = slotBase;
-            m_getValue = KJS_NUMERIC_PROPERTY_NAME_SLOT_MARKER;
-            m_data.numericFunc = getValue;
-        }
-        
-        void setGetterSlot(JSObject* getterFunc)
-        {
@@ -145 +142 @@
-        {
-            clearBase();
-m_getValue = undefinedGetter
+setValue(jsUndefined())
-        }
-
@@ -168 +165 @@
-        }
-
+        void clearValue()
+        {
+#ifndef NDEBUG
+            m_value = 0;
+#endif
+        }
+
-        const HashEntry* staticEntry() const { return m_data.staticEntry; }
-        unsigned index() const { return m_data.index; }
-
-    private:
-        static JSValue* undefinedGetter(ExecState*, const Identifier&, const PropertySlot&);
-        static JSValue* functionGetter(ExecState*, const Identifier&, const PropertySlot&);
-
-        GetValueFunc m_getValue;
+        
+        JSValue* m_value;
-
-        JSValue* m_slotBase;
@@ -184 +189 @@
-            const HashEntry* staticEntry;
-            unsigned index;
-            GetValueNumericFunc numericFunc;
-        } m_data;
-    };