Changeset 440 for trunk/JavaScriptCore/kjs/InternalFunction.cpp

Timestamp:

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

Author:

odole

Message:

merge with webkit revision 35814

Files:

• trunk/JavaScriptCore/kjs/InternalFunction.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/InternalFunction.cpp

@@ -29 +29 @@
-namespace KJS {
-
+ASSERT_CLASS_FITS_IN_CELL(InternalFunction);
+
-const ClassInfo InternalFunction::info = { "Function", 0, 0, 0 };
-
-
+ExecState* exec
-{
+    putDirect(exec->propertyNames().name, jsString(exec, exec->propertyNames().nullIdentifier.ustring()), DontDelete | ReadOnly | DontEnum);
-}
-
-
+ExecState* exec, 
-    : JSObject(prototype)
-    , m_name(name)
-{
+    putDirect(exec->propertyNames().name, jsString(exec, name.ustring()), DontDelete | ReadOnly | DontEnum);
+}
+
+const UString& InternalFunction::name(ExecState* exec)
+{
+    JSValue* v = getDirect(exec->propertyNames().name);
+    ASSERT(v->isString());
+    return static_cast<JSString*>(v)->value();
-}
-
@@ -46 +56 @@
-}
-
-bool InternalFunction::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
-    if (propertyName == exec->propertyNames().name) {
-        slot.setCustom(this, nameGetter);
-        return true;
-    }
-
-    return JSObject::getOwnPropertySlot(exec, propertyName, slot);
-}
-
-void InternalFunction::put(ExecState* exec, const Identifier& propertyName, JSValue* value)
-{
-    if (propertyName == exec->propertyNames().name)
-        return;
-    JSObject::put(exec, propertyName, value);
-}
-
-bool InternalFunction::deleteProperty(ExecState* exec, const Identifier& propertyName)
-{
-    if (propertyName == exec->propertyNames().name)
-        return false;
-    return JSObject::deleteProperty(exec, propertyName);
-}
-
-JSValue* InternalFunction::nameGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
-{
-    InternalFunction* thisObj = static_cast<InternalFunction*>(slot.slotBase());
-    return jsString(exec, thisObj->functionName().ustring());
-}
-
-} // namespace KJS