diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-10 11:23:52 (GMT) |
|---|---|---|
| committer | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2009-08-10 11:46:33 (GMT) |
| commit | af9ebb26298e80992cda4fb3bbb6a3384e59e94a (patch) | |
| tree | f512db277c0c20db5c3359ede8f779ef9038a9af /src/3rdparty/webkit/WebCore | |
| parent | fab932713af6dfa7aad06ddfde774d25f5222472 (diff) | |
| download | Qt-af9ebb26298e80992cda4fb3bbb6a3384e59e94a.zip Qt-af9ebb26298e80992cda4fb3bbb6a3384e59e94a.tar.gz Qt-af9ebb26298e80992cda4fb3bbb6a3384e59e94a.tar.bz2 | |
Debugger modification. Debugger receive column number from op_debug
opcode and pass it for DidReachBreakpoint and WillExecuteStatement
events as an argument.
Compilation fix for JIT.
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp b/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp index 10eff26..0aafd65 100644 --- a/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp +++ b/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.cpp @@ -459,7 +459,7 @@ void JavaScriptDebugServer::callEvent(const DebuggerCallFrame& debuggerCallFrame pauseIfNeeded(toPage(debuggerCallFrame.dynamicGlobalObject())); } -void JavaScriptDebugServer::atStatement(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber) +void JavaScriptDebugServer::atStatement(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber, int column) { if (m_paused) return; @@ -533,7 +533,7 @@ void JavaScriptDebugServer::didExecuteProgram(const DebuggerCallFrame& debuggerC m_currentCallFrame = m_currentCallFrame->caller(); } -void JavaScriptDebugServer::didReachBreakpoint(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber) +void JavaScriptDebugServer::didReachBreakpoint(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber, int /*column*/) { if (m_paused) return; diff --git a/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.h b/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.h index baa6699..505a616 100644 --- a/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.h +++ b/src/3rdparty/webkit/WebCore/inspector/JavaScriptDebugServer.h @@ -105,12 +105,12 @@ namespace WebCore { virtual void sourceParsed(JSC::ExecState*, const JSC::SourceCode&, int errorLine, const JSC::UString& errorMsg); virtual void callEvent(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineNumber); - virtual void atStatement(const JSC::DebuggerCallFrame&, intptr_t sourceID, int firstLine); + virtual void atStatement(const JSC::DebuggerCallFrame&, intptr_t sourceID, int firstLine, int column); virtual void returnEvent(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineNumber); virtual void exception(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineNumber); virtual void willExecuteProgram(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno); virtual void didExecuteProgram(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno); - virtual void didReachBreakpoint(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno); + virtual void didReachBreakpoint(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno, int column); void didAddListener(Page*); void didRemoveListener(Page*); |