source: webkit/trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp@ 43774

Last change on this file since 43774 was 43774, checked in by Adam Roben, 16 years ago

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):

File size: 3.3 KB
Line 
1/*
2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
14 * its contributors may be used to endorse or promote products derived
15 * from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include "config.h"
30#include "DebuggerCallFrame.h"
31
32#include "JSFunction.h"
33#include "CodeBlock.h"
34#include "Interpreter.h"
35#include "Parser.h"
36
37namespace JSC {
38
39const UString* DebuggerCallFrame::functionName() const
40{
41 if (!m_callFrame->codeBlock())
42 return 0;
43
44 JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee());
45 if (!function)
46 return 0;
47 return &function->name(&m_callFrame->globalData());
48}
49
50UString DebuggerCallFrame::calculatedFunctionName() const
51{
52 if (!m_callFrame->codeBlock())
53 return 0;
54
55 JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee());
56 if (!function)
57 return 0;
58 return function->calculatedDisplayName(&m_callFrame->globalData());
59}
60
61DebuggerCallFrame::Type DebuggerCallFrame::type() const
62{
63 if (m_callFrame->callee())
64 return FunctionType;
65
66 return ProgramType;
67}
68
69JSObject* DebuggerCallFrame::thisObject() const
70{
71 if (!m_callFrame->codeBlock())
72 return 0;
73
74 return asObject(m_callFrame->thisValue());
75}
76
77JSValue DebuggerCallFrame::evaluate(const UString& script, JSValue& exception) const
78{
79 if (!m_callFrame->codeBlock())
80 return JSValue();
81
82 int errLine;
83 UString errMsg;
84 SourceCode source = makeSource(script);
85 RefPtr<EvalNode> evalNode = m_callFrame->scopeChain()->globalData->parser->parse<EvalNode>(m_callFrame, m_callFrame->dynamicGlobalObject()->debugger(), source, &errLine, &errMsg);
86 if (!evalNode)
87 return Error::create(m_callFrame, SyntaxError, errMsg, errLine, source.provider()->asID(), source.provider()->url());
88
89 return m_callFrame->scopeChain()->globalData->interpreter->execute(evalNode.get(), m_callFrame, thisObject(), m_callFrame->scopeChain(), &exception);
90}
91
92} // namespace JSC
Note: See TracBrowser for help on using the repository browser.