[DevTools] Cleanup v8_inspector API part 1.

third_party/WebKit/Source/platform/v8_inspector/V8ConsoleMessage.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/v8_inspector/V8ConsoleMessage.h"
 
 #include "platform/v8_inspector/InspectedContext.h"
 #include "platform/v8_inspector/V8ConsoleAgentImpl.h"
 #include "platform/v8_inspector/V8DebuggerImpl.h"
 #include "platform/v8_inspector/V8InspectorSessionImpl.h"
@@ skipping 18 matching lines @@
     case RenderingMessageSource: return protocol::Console::ConsoleMessage::SourceEnum::Rendering;
     case SecurityMessageSource: return protocol::Console::ConsoleMessage::SourceEnum::Security;
     case OtherMessageSource: return protocol::Console::ConsoleMessage::SourceEnum::Other;
     case DeprecationMessageSource: return protocol::Console::ConsoleMessage::SourceEnum::Deprecation;
     case WorkerMessageSource: return protocol::Console::ConsoleMessage::SourceEnum::Worker;
     }
     return protocol::Console::ConsoleMessage::SourceEnum::Other;
 }
 
 
-String16 messageTypeValue(MessageType type)
+String16 consoleAPITypeValue(ConsoleAPIType type)
 {
     switch (type) {
-    case LogMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Log;
-    case ClearMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Clear;
-    case DirMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Dir;
-    case DirXMLMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Dirxml;
-    case TableMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Table;
-    case TraceMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Trace;
-    case StartGroupMessageType: return protocol::Console::ConsoleMessage::TypeEnum::StartGroup;
-    case StartGroupCollapsedMessageType: return protocol::Console::ConsoleMessage::TypeEnum::StartGroupCollapsed;
-    case EndGroupMessageType: return protocol::Console::ConsoleMessage::TypeEnum::EndGroup;
-    case AssertMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Assert;
-    case TimeEndMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Log;
-    case CountMessageType: return protocol::Console::ConsoleMessage::TypeEnum::Log;
+    case ConsoleAPIType::kLog: return protocol::Console::ConsoleMessage::TypeEnum::Log;
+    case ConsoleAPIType::kClear: return protocol::Console::ConsoleMessage::TypeEnum::Clear;
+    case ConsoleAPIType::kDir: return protocol::Console::ConsoleMessage::TypeEnum::Dir;
+    case ConsoleAPIType::kDirXML: return protocol::Console::ConsoleMessage::TypeEnum::Dirxml;
+    case ConsoleAPIType::kTable: return protocol::Console::ConsoleMessage::TypeEnum::Table;
+    case ConsoleAPIType::kTrace: return protocol::Console::ConsoleMessage::TypeEnum::Trace;
+    case ConsoleAPIType::kStartGroup: return protocol::Console::ConsoleMessage::TypeEnum::StartGroup;
+    case ConsoleAPIType::kStartGroupCollapsed: return protocol::Console::ConsoleMessage::TypeEnum::StartGroupCollapsed;
+    case ConsoleAPIType::kEndGroup: return protocol::Console::ConsoleMessage::TypeEnum::EndGroup;
+    case ConsoleAPIType::kAssert: return protocol::Console::ConsoleMessage::TypeEnum::Assert;
+    case ConsoleAPIType::kTimeEnd: return protocol::Console::ConsoleMessage::TypeEnum::Log;
+    case ConsoleAPIType::kCount: return protocol::Console::ConsoleMessage::TypeEnum::Log;
     }
     return protocol::Console::ConsoleMessage::TypeEnum::Log;
 }
 
 String16 messageLevelValue(MessageLevel level)
 {
     switch (level) {
     case DebugMessageLevel: return protocol::Console::ConsoleMessage::LevelEnum::Debug;
     case LogMessageLevel: return protocol::Console::ConsoleMessage::LevelEnum::Log;
     case WarningMessageLevel: return protocol::Console::ConsoleMessage::LevelEnum::Warning;
@@ skipping 139 matching lines @@
 V8ConsoleMessage::V8ConsoleMessage(V8MessageOrigin origin, double timestamp, MessageSource source, MessageLevel level, const String16& message)
     : m_origin(origin)
     , m_timestamp(timestamp)
     , m_source(source)
     , m_level(level)
     , m_message(message)
     , m_lineNumber(0)
     , m_columnNumber(0)
     , m_scriptId(0)
     , m_contextId(0)
-    , m_type(LogMessageType)
+    , m_type(ConsoleAPIType::kLog)
     , m_exceptionId(0)
     , m_revokedExceptionId(0)
 {
 }
 
 V8ConsoleMessage::~V8ConsoleMessage()
 {
 }
 
 void V8ConsoleMessage::setLocation(const String16& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
 {
     m_url = url;
     m_lineNumber = lineNumber;
     m_columnNumber = columnNumber;
     m_stackTrace = std::move(stackTrace);
     m_scriptId = scriptId;
 }
 
 void V8ConsoleMessage::reportToFrontend(protocol::Console::Frontend* frontend, V8InspectorSessionImpl* session, bool generatePreview) const
 {
     DCHECK_EQ(V8MessageOrigin::kConsole, m_origin);
     std::unique_ptr<protocol::Console::ConsoleMessage> result =
         protocol::Console::ConsoleMessage::create()
         .setSource(messageSourceValue(m_source))
         .setLevel(messageLevelValue(m_level))
         .setText(m_message)
         .setTimestamp(m_timestamp / 1000) // TODO(dgozman): migrate this to milliseconds.
         .build();
-    result->setType(messageTypeValue(m_type));
+    result->setType(consoleAPITypeValue(m_type));
     result->setLine(static_cast<int>(m_lineNumber));
     result->setColumn(static_cast<int>(m_columnNumber));
     if (m_scriptId)
         result->setScriptId(String16::number(m_scriptId));
     result->setUrl(m_url);
     if (m_source == NetworkMessageSource && !m_requestIdentifier.isEmpty())
         result->setNetworkRequestId(m_requestIdentifier);
     if (m_contextId)
         result->setExecutionContextId(m_contextId);
     std::unique_ptr<protocol::Array<protocol::Runtime::RemoteObject>> args = wrapArguments(session, generatePreview);
@@ skipping 12 matching lines @@
         return nullptr;
     InspectedContext* inspectedContext = session->debugger()->getContext(session->contextGroupId(), m_contextId);
     if (!inspectedContext)
         return nullptr;
 
     v8::Isolate* isolate = inspectedContext->isolate();
     v8::HandleScope handles(isolate);
     v8::Local<v8::Context> context = inspectedContext->context();
 
     std::unique_ptr<protocol::Array<protocol::Runtime::RemoteObject>> args = protocol::Array<protocol::Runtime::RemoteObject>::create();
-    if (m_type == TableMessageType && generatePreview) {
+    if (m_type == ConsoleAPIType::kTable && generatePreview) {
         v8::Local<v8::Value> table = m_arguments[0]->Get(isolate);
         v8::Local<v8::Value> columns = m_arguments.size() > 1 ? m_arguments[1]->Get(isolate) : v8::Local<v8::Value>();
         std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = session->wrapTable(context, table, columns);
         if (wrapped)
             args->addItem(std::move(wrapped));
         else
             args = nullptr;
     } else {
         for (size_t i = 0; i < m_arguments.size(); ++i) {
             std::unique_ptr<protocol::Runtime::RemoteObject> wrapped = session->wrapObject(context, m_arguments[i]->Get(isolate), "console", generatePreview);
@@ skipping 55 matching lines @@
 V8MessageOrigin V8ConsoleMessage::origin() const
 {
     return m_origin;
 }
 
 unsigned V8ConsoleMessage::argumentCount() const
 {
     return m_arguments.size();
 }
 
-MessageType V8ConsoleMessage::type() const
+ConsoleAPIType V8ConsoleMessage::type() const
 {
     return m_type;
 }
 
 // static
-std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(double timestamp, MessageType type, MessageLevel level, const String16& messageText, std::vector<v8::Local<v8::Value>>* arguments, std::unique_ptr<V8StackTrace> stackTrace, InspectedContext* context)
+std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(double timestamp, ConsoleAPIType type, MessageLevel level, const String16& messageText, std::vector<v8::Local<v8::Value>>* arguments, std::unique_ptr<V8StackTrace> stackTrace, InspectedContext* context)
 {
     String16 url;
     unsigned lineNumber = 0;
     unsigned columnNumber = 0;
     if (stackTrace && !stackTrace->isEmpty()) {
         url = stackTrace->topSourceURL();
         lineNumber = stackTrace->topLineNumber();
         columnNumber = stackTrace->topColumnNumber();
     }
 
@@ skipping 70 matching lines @@
 {
 }
 
 V8ConsoleMessageStorage::~V8ConsoleMessageStorage()
 {
     clear();
 }
 
 void V8ConsoleMessageStorage::addMessage(std::unique_ptr<V8ConsoleMessage> message)
 {
-    if (message->type() == ClearMessageType)
+    if (message->type() == ConsoleAPIType::kClear)
         clear();
 
     V8InspectorSessionImpl* session = m_debugger->sessionForContextGroup(m_contextGroupId);
     if (session) {
         if (message->origin() == V8MessageOrigin::kConsole)
             session->consoleAgent()->messageAdded(message.get());
         else
             session->runtimeAgent()->exceptionMessageAdded(message.get());
     }
 
@@ skipping 17 matching lines @@
     }
 }
 
 void V8ConsoleMessageStorage::contextDestroyed(int contextId)
 {
     for (size_t i = 0; i < m_messages.size(); ++i)
         m_messages[i]->contextDestroyed(contextId);
 }
 
 } // namespace blink