Changeset 43774 in webkit

Timestamp:

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

Author:

Adam Roben

Message:

2009-05-15 Francisco Tolmasky <​francisco@280north.com>

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

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def (modified) (1 diff)
• JavaScriptCore/debugger/DebuggerCallFrame.cpp (modified) (1 diff)
• JavaScriptCore/debugger/DebuggerCallFrame.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/JavaScriptCallFrame.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-05-15  Francisco Tolmasky  <francisco@280north.com>
+
+        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.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.
+
 2009-05-14  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -330 +330 @@
 __ZNK3JSC17DebuggerCallFrame10thisObjectEv
 __ZNK3JSC17DebuggerCallFrame12functionNameEv
+__ZNK3JSC17DebuggerCallFrame22calculatedFunctionNameEv
 __ZNK3JSC17DebuggerCallFrame4typeEv
 __ZNK3JSC17DebuggerCallFrame8evaluateERKNS_7UStringERNS_7JSValueE

trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -48 +48 @@
     ?attach@Debugger@JSC@@QAEXPAVJSGlobalObject@2@@Z
     ?broadcast@ThreadCondition@WTF@@QAEXXZ
+    ?calculatedFunctionName@DebuggerCallFrame@JSC@@QBE?AVUString@2@XZ
     ?call@JSC@@YA?AVJSValue@1@PAVExecState@1@V21@W4CallType@1@ABTCallData@1@1ABVArgList@1@@Z
     ?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z

trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore_debug.def

@@ -48 +48 @@
     ?attach@Debugger@JSC@@QAEXPAVJSGlobalObject@2@@Z
     ?broadcast@ThreadCondition@WTF@@QAEXXZ
+    ?calculatedFunctionName@DebuggerCallFrame@JSC@@QBE?AVUString@2@XZ
     ?call@JSC@@YA?AVJSValue@1@PAVExecState@1@V21@W4CallType@1@ABTCallData@1@1ABVArgList@1@@Z
     ?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z

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;

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-05-15  Francisco Tolmasky  <francisco@280north.com>
+
+        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.
+
+        * 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):
+
 2009-05-15  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/inspector/JavaScriptCallFrame.cpp

@@ -40 +40 @@
 
 namespace WebCore {
-
+    
 JavaScriptCallFrame::JavaScriptCallFrame(const DebuggerCallFrame& debuggerCallFrame, PassRefPtr<JavaScriptCallFrame> caller, intptr_t sourceID, int line)
     : m_debuggerCallFrame(debuggerCallFrame)
@@ -68 +68 @@
     if (!m_isValid)
         return String();
-    const UString* functionName = m_debuggerCallFrame.functionName();
-    if (!functionName)
+    UString functionName = m_debuggerCallFrame.calculatedFunctionName();
+    if (functionName.isEmpty())
         return String();
-    return *functionName;
+    return functionName;
 }