Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp

Issue 1696513002: DevTools: move protocol-related generators into inspector subfolder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
index 861484acf22f00691c4ac1aafe53232562fecc8d..dc178840c66c87aff49273be02e4985b8d2016dd 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
@@ -44,7 +44,7 @@ static const char consoleMessagesEnabled[] = "consoleMessagesEnabled";
}
InspectorConsoleAgent::InspectorConsoleAgent(V8RuntimeAgent* runtimeAgent)
- : InspectorBaseAgent<InspectorConsoleAgent, InspectorFrontend::Console>("Console")
+ : InspectorBaseAgent<InspectorConsoleAgent, protocol::Frontend::Console>("Console")
, m_runtimeAgent(runtimeAgent)
, m_debuggerAgent(nullptr)
, m_enabled(false)
@@ -107,7 +107,7 @@ void InspectorConsoleAgent::addMessageToConsole(ConsoleMessage* consoleMessage)
return;
if (!m_debuggerAgent || !m_debuggerAgent->enabled())
return;
- m_debuggerAgent->breakProgramOnException(InspectorFrontend::Debugger::Reason::Assert, nullptr);
+ m_debuggerAgent->breakProgramOnException(protocol::Frontend::Debugger::Reason::Assert, nullptr);
}
void InspectorConsoleAgent::clearAllMessages()
@@ -122,54 +122,54 @@ void InspectorConsoleAgent::consoleMessagesCleared()
frontend()->messagesCleared();
}
-static TypeBuilder::Console::ConsoleMessage::Source::Enum messageSourceValue(MessageSource source)
+static protocol::TypeBuilder::Console::ConsoleMessage::Source::Enum messageSourceValue(MessageSource source)
{
switch (source) {
- case XMLMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Xml;
- case JSMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Javascript;
- case NetworkMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Network;
- case ConsoleAPIMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Console_api;
- case StorageMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Storage;
- case AppCacheMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Appcache;
- case RenderingMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Rendering;
- case SecurityMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Security;
- case OtherMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Other;
- case DeprecationMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Deprecation;
+ case XMLMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Xml;
+ case JSMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Javascript;
+ case NetworkMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Network;
+ case ConsoleAPIMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Console_api;
+ case StorageMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Storage;
+ case AppCacheMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Appcache;
+ case RenderingMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Rendering;
+ case SecurityMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Security;
+ case OtherMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Other;
+ case DeprecationMessageSource: return protocol::TypeBuilder::Console::ConsoleMessage::Source::Deprecation;
}
- return TypeBuilder::Console::ConsoleMessage::Source::Other;
+ return protocol::TypeBuilder::Console::ConsoleMessage::Source::Other;
}
-static TypeBuilder::Console::ConsoleMessage::Type::Enum messageTypeValue(MessageType type)
+static protocol::TypeBuilder::Console::ConsoleMessage::Type::Enum messageTypeValue(MessageType type)
{
switch (type) {
- case LogMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Log;
- case ClearMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Clear;
- case DirMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Dir;
- case DirXMLMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Dirxml;
- case TableMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Table;
- case TraceMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Trace;
- case StartGroupMessageType: return TypeBuilder::Console::ConsoleMessage::Type::StartGroup;
- case StartGroupCollapsedMessageType: return TypeBuilder::Console::ConsoleMessage::Type::StartGroupCollapsed;
- case EndGroupMessageType: return TypeBuilder::Console::ConsoleMessage::Type::EndGroup;
- case AssertMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Assert;
- case TimeEndMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Log;
- case CountMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Log;
+ case LogMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Log;
+ case ClearMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Clear;
+ case DirMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Dir;
+ case DirXMLMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Dirxml;
+ case TableMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Table;
+ case TraceMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Trace;
+ case StartGroupMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::StartGroup;
+ case StartGroupCollapsedMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::StartGroupCollapsed;
+ case EndGroupMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::EndGroup;
+ case AssertMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Assert;
+ case TimeEndMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Log;
+ case CountMessageType: return protocol::TypeBuilder::Console::ConsoleMessage::Type::Log;
}
- return TypeBuilder::Console::ConsoleMessage::Type::Log;
+ return protocol::TypeBuilder::Console::ConsoleMessage::Type::Log;
}
-static TypeBuilder::Console::ConsoleMessage::Level::Enum messageLevelValue(MessageLevel level)
+static protocol::TypeBuilder::Console::ConsoleMessage::Level::Enum messageLevelValue(MessageLevel level)
{
switch (level) {
- case DebugMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Debug;
- case LogMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Log;
- case WarningMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Warning;
- case ErrorMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Error;
- case InfoMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Info;
- case RevokedErrorMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::RevokedError;
+ case DebugMessageLevel: return protocol::TypeBuilder::Console::ConsoleMessage::Level::Debug;
+ case LogMessageLevel: return protocol::TypeBuilder::Console::ConsoleMessage::Level::Log;
+ case WarningMessageLevel: return protocol::TypeBuilder::Console::ConsoleMessage::Level::Warning;
+ case ErrorMessageLevel: return protocol::TypeBuilder::Console::ConsoleMessage::Level::Error;
+ case InfoMessageLevel: return protocol::TypeBuilder::Console::ConsoleMessage::Level::Info;
+ case RevokedErrorMessageLevel: return protocol::TypeBuilder::Console::ConsoleMessage::Level::RevokedError;
}
- return TypeBuilder::Console::ConsoleMessage::Level::Log;
+ return protocol::TypeBuilder::Console::ConsoleMessage::Level::Log;
}
void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* consoleMessage, bool generatePreview)
@@ -177,7 +177,7 @@ void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* console
if (consoleMessage->workerGlobalScopeProxy())
return;
- RefPtr<TypeBuilder::Console::ConsoleMessage> jsonObj = TypeBuilder::Console::ConsoleMessage::create()
+ RefPtr<protocol::TypeBuilder::Console::ConsoleMessage> jsonObj = protocol::TypeBuilder::Console::ConsoleMessage::create()
.setSource(messageSourceValue(consoleMessage->source()))
.setLevel(messageLevelValue(consoleMessage->level()))
.setText(consoleMessage->message())
@@ -198,18 +198,18 @@ void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* console
if (arguments && arguments->argumentCount()) {
ScriptState::Scope scope(arguments->scriptState());
v8::Local<v8::Context> context = arguments->scriptState()->context();
- RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject>> jsonArgs = TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject>::create();
+ RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Runtime::RemoteObject>> jsonArgs = protocol::TypeBuilder::Array<protocol::TypeBuilder::Runtime::RemoteObject>::create();
if (consoleMessage->type() == TableMessageType && generatePreview) {
v8::Local<v8::Value> table = arguments->argumentAt(0).v8Value();
v8::Local<v8::Value> columns = arguments->argumentCount() > 1 ? arguments->argumentAt(1).v8Value() : v8::Local<v8::Value>();
- RefPtr<TypeBuilder::Runtime::RemoteObject> inspectorValue = m_runtimeAgent->wrapTable(context, table, columns);
+ RefPtr<protocol::TypeBuilder::Runtime::RemoteObject> inspectorValue = m_runtimeAgent->wrapTable(context, table, columns);
if (inspectorValue)
jsonArgs->addItem(inspectorValue);
else
jsonArgs = nullptr;
} else {
for (unsigned i = 0; i < arguments->argumentCount(); ++i) {
- RefPtr<TypeBuilder::Runtime::RemoteObject> inspectorValue = m_runtimeAgent->wrapObject(context, arguments->argumentAt(i).v8Value(), "console", generatePreview);
+ RefPtr<protocol::TypeBuilder::Runtime::RemoteObject> inspectorValue = m_runtimeAgent->wrapObject(context, arguments->argumentAt(i).v8Value(), "console", generatePreview);
if (!inspectorValue) {
jsonArgs = nullptr;
break;

Powered by Google App Engine
This is Rietveld 408576698