| 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/V8DebuggerImpl.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" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 { | 41 { |
| 42 if (!m_enabled) | 42 if (!m_enabled) |
| 43 return; | 43 return; |
| 44 m_session->debugger()->disableStackCapturingIfNeeded(); | 44 m_session->debugger()->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 m_session->debugger()->ensureConsoleMessageStorage(m_session->contextGroupId
())->clear(); | |
| 52 } | 51 } |
| 53 | 52 |
| 54 void V8ConsoleAgentImpl::restore() | 53 void V8ConsoleAgentImpl::restore() |
| 55 { | 54 { |
| 56 if (!m_state->booleanProperty(ConsoleAgentState::consoleEnabled, false)) | 55 if (!m_state->booleanProperty(ConsoleAgentState::consoleEnabled, false)) |
| 57 return; | 56 return; |
| 58 ErrorString ignored; | 57 ErrorString ignored; |
| 59 enable(&ignored); | 58 enable(&ignored); |
| 60 } | 59 } |
| 61 | 60 |
| 62 void V8ConsoleAgentImpl::messageAdded(V8ConsoleMessage* message) | 61 void V8ConsoleAgentImpl::messageAdded(V8ConsoleMessage* message) |
| 63 { | 62 { |
| 64 if (m_enabled) | 63 if (m_enabled) |
| 65 reportMessage(message, true); | 64 reportMessage(message, true); |
| 66 } | 65 } |
| 67 | 66 |
| 68 bool V8ConsoleAgentImpl::enabled() | 67 bool V8ConsoleAgentImpl::enabled() |
| 69 { | 68 { |
| 70 return m_enabled; | 69 return m_enabled; |
| 71 } | 70 } |
| 72 | 71 |
| 73 void V8ConsoleAgentImpl::reportAllMessages() | 72 void V8ConsoleAgentImpl::reportAllMessages() |
| 74 { | 73 { |
| 75 V8ConsoleMessageStorage* storage = m_session->debugger()->ensureConsoleMessa
geStorage(m_session->contextGroupId()); | 74 V8ConsoleMessageStorage* storage = m_session->debugger()->ensureConsoleMessa
geStorage(m_session->contextGroupId()); |
| 76 if (storage->expiredCount()) { | |
| 77 std::unique_ptr<protocol::Console::ConsoleMessage> expired = protocol::C
onsole::ConsoleMessage::create() | |
| 78 .setSource(protocol::Console::ConsoleMessage::SourceEnum::Other) | |
| 79 .setLevel(protocol::Console::ConsoleMessage::LevelEnum::Warning) | |
| 80 .setText(String16::fromInteger(storage->expiredCount()) + String16("
console messages are not shown.")) | |
| 81 .setTimestamp(0) | |
| 82 .build(); | |
| 83 expired->setType(protocol::Console::ConsoleMessage::TypeEnum::Log); | |
| 84 expired->setLine(0); | |
| 85 expired->setColumn(0); | |
| 86 expired->setUrl(""); | |
| 87 m_frontend.messageAdded(std::move(expired)); | |
| 88 m_frontend.flush(); | |
| 89 } | |
| 90 for (const auto& message : storage->messages()) { | 75 for (const auto& message : storage->messages()) { |
| 91 if (message->origin() == V8MessageOrigin::kExternalConsole || message->o
rigin() == V8MessageOrigin::kConsole) | 76 if (message->origin() == V8MessageOrigin::kConsole) |
| 92 reportMessage(message.get(), false); | 77 reportMessage(message.get(), false); |
| 93 } | 78 } |
| 94 } | 79 } |
| 95 | 80 |
| 96 void V8ConsoleAgentImpl::reportMessage(V8ConsoleMessage* message, bool generateP
review) | 81 void V8ConsoleAgentImpl::reportMessage(V8ConsoleMessage* message, bool generateP
review) |
| 97 { | 82 { |
| 98 DCHECK(message->origin() == V8MessageOrigin::kExternalConsole || message->or
igin() == V8MessageOrigin::kConsole); | 83 DCHECK(message->origin() == V8MessageOrigin::kConsole); |
| 99 message->reportToFrontend(&m_frontend, m_session, generatePreview); | 84 message->reportToFrontend(&m_frontend); |
| 100 m_frontend.flush(); | 85 m_frontend.flush(); |
| 101 } | 86 } |
| 102 | 87 |
| 103 } // namespace blink | 88 } // namespace blink |
| OLD | NEW |