Changeset 35228 in webkit for trunk/JavaScriptCore

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.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• kjs/InternalFunction.cpp (modified) (2 diffs)
• kjs/InternalFunction.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ -2 +2 @@
 
         Roll out r35199 as it is causing failures on the PPC build.
+
+2008-07-17  Geoffrey Garen  <[email protected]>
+
+        Reviewed by David Kilzer.
+        
+        Fixed https://bugs.webkit.org/show_bug.cgi?id=20067
+        Support function.name (Firefox extension)
+        
+        Pretty straight-forward.
 
 2008-07-17  Geoffrey Garen  <[email protected]>

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -128 +128 @@
 __ZN3KJS14constructArrayEPNS_9ExecStateERKNS_7ArgListE
 __ZN3KJS15JSWrapperObject4markEv
+__ZN3KJS16InternalFunction14deletePropertyEPNS_9ExecStateERKNS_10IdentifierE
+__ZN3KJS16InternalFunction18getOwnPropertySlotEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
+__ZN3KJS16InternalFunction3putEPNS_9ExecStateERKNS_10IdentifierEPNS_7JSValueE
 __ZN3KJS16InternalFunction4infoE
 __ZN3KJS16InternalFunctionC2EPNS_17FunctionPrototypeERKNS_10IdentifierE

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

trunk/JavaScriptCore/kjs/InternalFunction.h

@@ -37 +37 @@
         static const ClassInfo info;
 
+        virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+        virtual void put(ExecState*, const Identifier& propertyName, JSValue*);
+        virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
+
         const Identifier& functionName() const { return m_name; }
 
@@ -44 +48 @@
 
     private:
+        static JSValue* nameGetter(ExecState*, const Identifier&, const PropertySlot&);
         virtual CallType getCallData(CallData&) = 0;
         virtual bool implementsHasInstance() const;