diff options
| author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
| commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
| tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/inspector/JavaScriptCallFrame.cpp | |
| parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
| download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 | |
Get WebKit r44544.
Diffstat (limited to 'WebCore/inspector/JavaScriptCallFrame.cpp')
| -rw-r--r-- | WebCore/inspector/JavaScriptCallFrame.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/WebCore/inspector/JavaScriptCallFrame.cpp b/WebCore/inspector/JavaScriptCallFrame.cpp index 4962892..6e8fce9 100644 --- a/WebCore/inspector/JavaScriptCallFrame.cpp +++ b/WebCore/inspector/JavaScriptCallFrame.cpp @@ -26,6 +26,8 @@ #include "config.h" #include "JavaScriptCallFrame.h" +#if ENABLE(JAVASCRIPT_DEBUGGER) + #include "PlatformString.h" #include <debugger/DebuggerCallFrame.h> #include <runtime/JSGlobalObject.h> @@ -37,7 +39,7 @@ using namespace JSC; namespace WebCore { - + JavaScriptCallFrame::JavaScriptCallFrame(const DebuggerCallFrame& debuggerCallFrame, PassRefPtr<JavaScriptCallFrame> caller, intptr_t sourceID, int line) : m_debuggerCallFrame(debuggerCallFrame) , m_caller(caller) @@ -65,10 +67,10 @@ String JavaScriptCallFrame::functionName() const ASSERT(m_isValid); 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; } DebuggerCallFrame::Type JavaScriptCallFrame::type() const @@ -88,7 +90,7 @@ JSObject* JavaScriptCallFrame::thisObject() const } // Evaluate some JavaScript code in the scope of this frame. -JSValuePtr JavaScriptCallFrame::evaluate(const UString& script, JSValuePtr& exception) const +JSValue JavaScriptCallFrame::evaluate(const UString& script, JSValue& exception) const { ASSERT(m_isValid); if (!m_isValid) @@ -99,3 +101,5 @@ JSValuePtr JavaScriptCallFrame::evaluate(const UString& script, JSValuePtr& exce } } // namespace WebCore + +#endif // ENABLE(JAVASCRIPT_DEBUGGER) |