diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/inspector/JavaScriptDebugServer.cpp | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/inspector/JavaScriptDebugServer.cpp')
| -rw-r--r-- | WebCore/inspector/JavaScriptDebugServer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/inspector/JavaScriptDebugServer.cpp b/WebCore/inspector/JavaScriptDebugServer.cpp index e460ae8..4aab347 100644 --- a/WebCore/inspector/JavaScriptDebugServer.cpp +++ b/WebCore/inspector/JavaScriptDebugServer.cpp @@ -75,7 +75,7 @@ JavaScriptDebugServer& JavaScriptDebugServer::shared() JavaScriptDebugServer::JavaScriptDebugServer() : m_callingListeners(false) - , m_pauseOnExceptions(false) + , m_pauseOnExceptionsState(DontPauseOnExceptions) , m_pauseOnNextStatement(false) , m_paused(false) , m_doneProcessingDebuggerEvents(true) @@ -249,9 +249,9 @@ void JavaScriptDebugServer::clearBreakpoints() m_breakpoints.clear(); } -void JavaScriptDebugServer::setPauseOnExceptions(bool pause) +void JavaScriptDebugServer::setPauseOnExceptionsState(PauseOnExceptionsState pause) { - m_pauseOnExceptions = pause; + m_pauseOnExceptionsState = pause; } void JavaScriptDebugServer::pauseProgram() @@ -423,7 +423,7 @@ void JavaScriptDebugServer::setJavaScriptPaused(Frame* frame, bool paused) { ASSERT_ARG(frame, frame); - if (!frame->script()->isEnabled()) + if (!frame->script()->canExecuteScripts()) return; frame->script()->setPaused(paused); @@ -540,7 +540,7 @@ void JavaScriptDebugServer::returnEvent(const DebuggerCallFrame& debuggerCallFra m_currentCallFrame = m_currentCallFrame->caller(); } -void JavaScriptDebugServer::exception(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber) +void JavaScriptDebugServer::exception(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber, bool hasHandler) { if (m_paused) return; @@ -549,7 +549,7 @@ void JavaScriptDebugServer::exception(const DebuggerCallFrame& debuggerCallFrame if (!m_currentCallFrame) return; - if (m_pauseOnExceptions) + if (m_pauseOnExceptionsState == PauseOnAllExceptions || (m_pauseOnExceptionsState == PauseOnUncaughtExceptions && !hasHandler)) m_pauseOnNextStatement = true; m_currentCallFrame->update(debuggerCallFrame, sourceID, lineNumber); |