diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 09:06:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 09:31:31 (GMT) |
| commit | c411f16870f112c3407c28c22b617f613a82cff4 (patch) | |
| tree | 29a1bcd590c8b31af2aab445bfe8a978dc5bf582 /src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerCallFrame.h | |
| parent | 3d77b56b32a0c53ec0bbfaa07236fedb900ff336 (diff) | |
| download | Qt-c411f16870f112c3407c28c22b617f613a82cff4.zip Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.gz Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerCallFrame.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerCallFrame.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerCallFrame.h b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerCallFrame.h index cdf4965..9d377ef 100644 --- a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerCallFrame.h +++ b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerCallFrame.h @@ -39,11 +39,10 @@ namespace JSC { DebuggerCallFrame(CallFrame* callFrame) : m_callFrame(callFrame) - , m_exception(noValue()) { } - DebuggerCallFrame(CallFrame* callFrame, JSValuePtr exception) + DebuggerCallFrame(CallFrame* callFrame, JSValue exception) : m_callFrame(callFrame) , m_exception(exception) { @@ -52,14 +51,15 @@ namespace JSC { JSGlobalObject* dynamicGlobalObject() const { return m_callFrame->dynamicGlobalObject(); } const ScopeChainNode* scopeChain() const { return m_callFrame->scopeChain(); } const UString* functionName() const; + UString calculatedFunctionName() const; Type type() const; JSObject* thisObject() const; - JSValuePtr evaluate(const UString&, JSValuePtr& exception) const; - JSValuePtr exception() const { return m_exception; } + JSValue evaluate(const UString&, JSValue& exception) const; + JSValue exception() const { return m_exception; } private: CallFrame* m_callFrame; - JSValuePtr m_exception; + JSValue m_exception; }; } // namespace JSC |