diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp')
| -rw-r--r-- | Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp index a48e7d156..97e792b6d 100644 --- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp +++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp @@ -36,7 +36,7 @@ namespace JSC { -const UString* DebuggerCallFrame::functionName() const +const String* DebuggerCallFrame::functionName() const { if (!m_callFrame->codeBlock()) return 0; @@ -50,15 +50,15 @@ const UString* DebuggerCallFrame::functionName() const return &jsCast<JSFunction*>(function)->name(m_callFrame); } -UString DebuggerCallFrame::calculatedFunctionName() const +String DebuggerCallFrame::calculatedFunctionName() const { if (!m_callFrame->codeBlock()) - return UString(); + return String(); JSObject* function = m_callFrame->callee(); if (!function) - return UString(); + return String(); return getCalculatedDisplayName(m_callFrame, function); } @@ -84,7 +84,7 @@ JSObject* DebuggerCallFrame::thisObject() const return asObject(thisValue); } -JSValue DebuggerCallFrame::evaluate(const UString& script, JSValue& exception) const +JSValue DebuggerCallFrame::evaluate(const String& script, JSValue& exception) const { if (!m_callFrame->codeBlock()) return JSValue(); @@ -96,7 +96,7 @@ JSValue DebuggerCallFrame::evaluate(const UString& script, JSValue& exception) c globalData.exception = JSValue(); } - JSValue result = globalData.interpreter->execute(eval, m_callFrame, thisObject(), m_callFrame->scopeChain()); + JSValue result = globalData.interpreter->execute(eval, m_callFrame, thisObject(), m_callFrame->scope()); if (globalData.exception) { exception = globalData.exception; globalData.exception = JSValue(); |