Changeset 35228 in webkit for trunk/JavaScriptCore/kjs/InternalFunction.cpp

Timestamp:

Jul 17, 2008, 2:42:24 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-17 Sam Weinig <​[email protected]>

Roll out r35199 as it is causing failures on the PPC build.

LayoutTests:

2008-07-17 Geoffrey Garen <​[email protected]>

Reviewed by David Kilzer.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=20067
Support function.name (Firefox extension)

• fast/js/function-name-expected.txt: Added.
• fast/js/function-name.html: Added.
• fast/js/resources/function-name.js: Added.

File:

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

trunk/JavaScriptCore/kjs/InternalFunction.cpp

@@ -22 +22 @@
 
 #include "config.h"
-#include "JSFunction.h"
+#include "InternalFunction.h"
 
 #include "FunctionPrototype.h"
@@ -45 +45 @@
 }
 
+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