Changeset 43774 in webkit for trunk/JavaScriptCore/debugger

Timestamp:

May 15, 2009, 11:13:28 AM (16 years ago)

Author:

Adam Roben

Message:

2009-05-15 Francisco Tolmasky <​[email protected]>

BUG 25467: JavaScript debugger should use function.displayName as the function's name in the call stack
<​https://bugs.webkit.org/show_bug.cgi?id=25467>

Reviewed by Adam Roben.

JavaScriptCore:

• JavaScriptCore.exp: Added calculatedFunctionName
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def: Added calculatedFunctionName
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: Added calculatedFunctionName
• debugger/DebuggerCallFrame.cpp: Added calculatedFunctionName to match existing one in ProfileNode. (JSC::DebuggerCallFrame::calculatedFunctionName):
• debugger/DebuggerCallFrame.h: Added calculatedFunctionName to match existing one in ProfileNode.

WebCore:

• inspector/JavaScriptCallFrame.cpp: (WebCore::JavaScriptCallFrame::functionName): Use calculatedFunctionName which takes into account displayName

inspector/front-end/CallStackSidebarPane.js: Remove "

anonymous function" since it is handled internally just like in profiles

(WebInspector.CallStackSidebarPane.prototype.update):

Location:

trunk/JavaScriptCore/debugger

Files:

• DebuggerCallFrame.cpp (modified) (1 diff)
• DebuggerCallFrame.h (modified) (1 diff)

trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp

@@ -47 +47 @@
     return &function->name(&m_callFrame->globalData());
 }
+    
+UString DebuggerCallFrame::calculatedFunctionName() const
+{
+    if (!m_callFrame->codeBlock())
+        return 0;
+    
+    JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee());
+    if (!function)
+        return 0;
+    return function->calculatedDisplayName(&m_callFrame->globalData());
+}
 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const

trunk/JavaScriptCore/debugger/DebuggerCallFrame.h

@@ -52 +52 @@
         const ScopeChainNode* scopeChain() const { return m_callFrame->scopeChain(); }
         const UString* functionName() const;
+        UString calculatedFunctionName() const;
         Type type() const;
         JSObject* thisObject() const;