Changeset 42478 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Apr 13, 2009, 11:24:43 PM (16 years ago)

Author:

[email protected]

Message:

BUG 25171: It should be possible to manually set the name of an anonymous function
<​https://bugs.webkit.org/show_bug.cgi?id=25171>

Submitted by Francisco Tolmasky <​[email protected]>
Reviewed by Oliver Hunt.

This change adds the displayName property to functions, which when set overrides the
normal name when appearing in the console.

Location:

trunk/JavaScriptCore/runtime

Files:

• CommonIdentifiers.h (modified) (1 diff)
• InternalFunction.cpp (modified) (1 diff)
• InternalFunction.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -64 +64 @@
     macro(toString) \
     macro(UTC) \
-    macro(valueOf)
+    macro(valueOf) \
+    macro(displayName)
 
 namespace JSC {

trunk/JavaScriptCore/runtime/InternalFunction.cpp

@@ -49 +49 @@
 }
 
+const UString& InternalFunction::displayName(JSGlobalData* globalData)
+{
+    JSValuePtr displayName = getDirect(globalData->propertyNames->displayName);
+    
+    if (displayName)
+        return asString(displayName)->value();
+    
+    return UString::null();
+}
+
+const UString& InternalFunction::calculatedDisplayName(JSGlobalData* globalData)
+{
+    const UString& explicitName = displayName(globalData);
+    
+    if (!explicitName.isEmpty())
+        return explicitName;
+    
+    return name(globalData);
+}
+
 } // namespace JSC

trunk/JavaScriptCore/runtime/InternalFunction.h

@@ -38 +38 @@
 
         const UString& name(JSGlobalData*);
+        const UString& displayName(JSGlobalData*);
+        const UString& calculatedDisplayName(JSGlobalData*);
 
         static PassRefPtr<Structure> createStructure(JSValuePtr proto)