| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "platform/v8_inspector/V8ConsoleAgentImpl.h" | 5 #include "platform/v8_inspector/V8ConsoleAgentImpl.h" |
| 6 | 6 |
| 7 #include "platform/v8_inspector/V8ConsoleMessage.h" | 7 #include "platform/v8_inspector/V8ConsoleMessage.h" |
| 8 #include "platform/v8_inspector/V8DebuggerImpl.h" | 8 #include "platform/v8_inspector/V8InspectorImpl.h" |
| 9 #include "platform/v8_inspector/V8InspectorSessionImpl.h" | 9 #include "platform/v8_inspector/V8InspectorSessionImpl.h" |
| 10 #include "platform/v8_inspector/V8StackTraceImpl.h" | 10 #include "platform/v8_inspector/V8StackTraceImpl.h" |
| 11 | 11 |
| 12 namespace blink { | 12 namespace blink { |
| 13 | 13 |
| 14 namespace ConsoleAgentState { | 14 namespace ConsoleAgentState { |
| 15 static const char consoleEnabled[] = "consoleEnabled"; | 15 static const char consoleEnabled[] = "consoleEnabled"; |
| 16 } | 16 } |
| 17 | 17 |
| 18 V8ConsoleAgentImpl::V8ConsoleAgentImpl(V8InspectorSessionImpl* session, protocol
::FrontendChannel* frontendChannel, protocol::DictionaryValue* state) | 18 V8ConsoleAgentImpl::V8ConsoleAgentImpl(V8InspectorSessionImpl* session, protocol
::FrontendChannel* frontendChannel, protocol::DictionaryValue* state) |
| 19 : m_session(session) | 19 : m_session(session) |
| 20 , m_state(state) | 20 , m_state(state) |
| 21 , m_frontend(frontendChannel) | 21 , m_frontend(frontendChannel) |
| 22 , m_enabled(false) | 22 , m_enabled(false) |
| 23 { | 23 { |
| 24 } | 24 } |
| 25 | 25 |
| 26 V8ConsoleAgentImpl::~V8ConsoleAgentImpl() | 26 V8ConsoleAgentImpl::~V8ConsoleAgentImpl() |
| 27 { | 27 { |
| 28 } | 28 } |
| 29 | 29 |
| 30 void V8ConsoleAgentImpl::enable(ErrorString* errorString) | 30 void V8ConsoleAgentImpl::enable(ErrorString* errorString) |
| 31 { | 31 { |
| 32 if (m_enabled) | 32 if (m_enabled) |
| 33 return; | 33 return; |
| 34 m_state->setBoolean(ConsoleAgentState::consoleEnabled, true); | 34 m_state->setBoolean(ConsoleAgentState::consoleEnabled, true); |
| 35 m_enabled = true; | 35 m_enabled = true; |
| 36 m_session->debugger()->enableStackCapturingIfNeeded(); | 36 m_session->inspector()->enableStackCapturingIfNeeded(); |
| 37 reportAllMessages(); | 37 reportAllMessages(); |
| 38 } | 38 } |
| 39 | 39 |
| 40 void V8ConsoleAgentImpl::disable(ErrorString* errorString) | 40 void V8ConsoleAgentImpl::disable(ErrorString* errorString) |
| 41 { | 41 { |
| 42 if (!m_enabled) | 42 if (!m_enabled) |
| 43 return; | 43 return; |
| 44 m_session->debugger()->disableStackCapturingIfNeeded(); | 44 m_session->inspector()->disableStackCapturingIfNeeded(); |
| 45 m_state->setBoolean(ConsoleAgentState::consoleEnabled, false); | 45 m_state->setBoolean(ConsoleAgentState::consoleEnabled, false); |
| 46 m_enabled = false; | 46 m_enabled = false; |
| 47 } | 47 } |
| 48 | 48 |
| 49 void V8ConsoleAgentImpl::clearMessages(ErrorString* errorString) | 49 void V8ConsoleAgentImpl::clearMessages(ErrorString* errorString) |
| 50 { | 50 { |
| 51 } | 51 } |
| 52 | 52 |
| 53 void V8ConsoleAgentImpl::restore() | 53 void V8ConsoleAgentImpl::restore() |
| 54 { | 54 { |
| 55 if (!m_state->booleanProperty(ConsoleAgentState::consoleEnabled, false)) | 55 if (!m_state->booleanProperty(ConsoleAgentState::consoleEnabled, false)) |
| 56 return; | 56 return; |
| 57 ErrorString ignored; | 57 ErrorString ignored; |
| 58 enable(&ignored); | 58 enable(&ignored); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void V8ConsoleAgentImpl::messageAdded(V8ConsoleMessage* message) | 61 void V8ConsoleAgentImpl::messageAdded(V8ConsoleMessage* message) |
| 62 { | 62 { |
| 63 if (m_enabled) | 63 if (m_enabled) |
| 64 reportMessage(message, true); | 64 reportMessage(message, true); |
| 65 } | 65 } |
| 66 | 66 |
| 67 bool V8ConsoleAgentImpl::enabled() | 67 bool V8ConsoleAgentImpl::enabled() |
| 68 { | 68 { |
| 69 return m_enabled; | 69 return m_enabled; |
| 70 } | 70 } |
| 71 | 71 |
| 72 void V8ConsoleAgentImpl::reportAllMessages() | 72 void V8ConsoleAgentImpl::reportAllMessages() |
| 73 { | 73 { |
| 74 V8ConsoleMessageStorage* storage = m_session->debugger()->ensureConsoleMessa
geStorage(m_session->contextGroupId()); | 74 V8ConsoleMessageStorage* storage = m_session->inspector()->ensureConsoleMess
ageStorage(m_session->contextGroupId()); |
| 75 for (const auto& message : storage->messages()) { | 75 for (const auto& message : storage->messages()) { |
| 76 if (message->origin() == V8MessageOrigin::kConsole) | 76 if (message->origin() == V8MessageOrigin::kConsole) |
| 77 reportMessage(message.get(), false); | 77 reportMessage(message.get(), false); |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 | 80 |
| 81 void V8ConsoleAgentImpl::reportMessage(V8ConsoleMessage* message, bool generateP
review) | 81 void V8ConsoleAgentImpl::reportMessage(V8ConsoleMessage* message, bool generateP
review) |
| 82 { | 82 { |
| 83 DCHECK(message->origin() == V8MessageOrigin::kConsole); | 83 DCHECK(message->origin() == V8MessageOrigin::kConsole); |
| 84 message->reportToFrontend(&m_frontend); | 84 message->reportToFrontend(&m_frontend); |
| 85 m_frontend.flush(); | 85 m_frontend.flush(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace blink | 88 } // namespace blink |
| OLD | NEW |