| Index: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| index 664b9a37cc9a3031c88a4365eca0ecdff0bd6aa2..10a887c443489d9493336adae89e73cd694867d5 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| @@ -799,7 +799,7 @@ void V8DebuggerAgentImpl::getCollectionEntries(ErrorString* errorString, const S
|
| void V8DebuggerAgentImpl::schedulePauseOnNextStatement(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data)
|
| {
|
| ASSERT(enabled());
|
| - if (m_scheduledDebuggerStep == StepInto || m_javaScriptPauseScheduled || isPaused())
|
| + if (m_scheduledDebuggerStep == StepInto || m_javaScriptPauseScheduled || isPaused() || !debugger().breakpointsActivated())
|
| return;
|
| m_breakReason = breakReason;
|
| m_breakAuxData = data;
|
| @@ -1565,7 +1565,7 @@ bool V8DebuggerAgentImpl::canBreakProgram()
|
| void V8DebuggerAgentImpl::breakProgram(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data)
|
| {
|
| ASSERT(enabled());
|
| - if (m_skipAllPauses || !m_pausedContext.IsEmpty() || isCallStackEmptyOrBlackboxed())
|
| + if (m_skipAllPauses || !m_pausedContext.IsEmpty() || isCallStackEmptyOrBlackboxed() || !debugger().breakpointsActivated())
|
| return;
|
| m_breakReason = breakReason;
|
| m_breakAuxData = data;
|
|
|