[DevTools] Cleanup v8_inspector console API.

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 316 matching lines @@
         message->m_columnNumber = stackTrace->topColumnNumber();
     }
     message->m_stackTrace = std::move(stackTrace);
     message->m_type = type;
     message->m_contextId = context->contextId();
     for (size_t i = 0; i < arguments.size(); ++i)
         message->m_arguments.push_back(wrapUnique(new v8::Global<v8::Value>(context->isolate(), arguments.at(i))));
     if (arguments.size())
         message->m_message = V8ValueStringBuilder::toString(arguments[0], context->isolate());
 
-    MessageLevel level = LogMessageLevel;
+    V8ConsoleAPIType clientType = V8ConsoleAPIType::kLog;
     if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount || type == ConsoleAPIType::kTimeEnd)
-        level = DebugMessageLevel;
+        clientType = V8ConsoleAPIType::kDebug;
     if (type == ConsoleAPIType::kError || type == ConsoleAPIType::kAssert)

[kozy, 2016/07/29 16:57:37]

if -> else if

[dgozman, 2016/07/29 17:15:43]

Done.

-        level = ErrorMessageLevel;
+        clientType = V8ConsoleAPIType::kError;
     if (type == ConsoleAPIType::kWarning)
-        level = WarningMessageLevel;
+        clientType = V8ConsoleAPIType::kWarning;
     if (type == ConsoleAPIType::kInfo)
-        level = InfoMessageLevel;
-    context->debugger()->client()->consoleAPIMessage(context->contextGroupId(), level, message->m_message, message->m_url, message->m_lineNumber, message->m_columnNumber, message->m_stackTrace.get());
+        clientType = V8ConsoleAPIType::kInfo;
+    if (type == ConsoleAPIType::kClear)
+        clientType = V8ConsoleAPIType::kClear;
+    context->debugger()->client()->consoleAPIMessage(context->contextGroupId(), clientType, message->m_message, message->m_url, message->m_lineNumber, message->m_columnNumber, message->m_stackTrace.get());
 
     return message;
 }
 
 // static
 std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForException(double timestamp, const String16& messageText, const String16& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTraceImpl> stackTrace, int scriptId, v8::Isolate* isolate, int contextId, v8::Local<v8::Value> exception, unsigned exceptionId)
 {
     std::unique_ptr<V8ConsoleMessage> message = wrapUnique(new V8ConsoleMessage(V8MessageOrigin::kException, timestamp, messageText));
     message->setLocation(url, lineNumber, columnNumber, std::move(stackTrace), scriptId);
     message->m_exceptionId = exceptionId;
@@ skipping 28 matching lines @@
 V8ConsoleMessageStorage::V8ConsoleMessageStorage(V8DebuggerImpl* debugger, int contextGroupId)
     : m_debugger(debugger)
     , m_contextGroupId(contextGroupId)
     , m_expiredCount(0)
 {
 }
 
 V8ConsoleMessageStorage::~V8ConsoleMessageStorage()
 {
     clear();
-    notifyClear();
 }
 
 void V8ConsoleMessageStorage::addMessage(std::unique_ptr<V8ConsoleMessage> message)
 {
-    if (message->type() == ConsoleAPIType::kClear) {
+    if (message->type() == ConsoleAPIType::kClear)
         clear();
-        notifyClear();
-    }
 
     V8InspectorSessionImpl* session = m_debugger->sessionForContextGroup(m_contextGroupId);
     if (session) {
         if (message->origin() == V8MessageOrigin::kConsole)
             session->consoleAgent()->messageAdded(message.get());
         session->runtimeAgent()->messageAdded(message.get());
     }
 
     DCHECK(m_messages.size() <= maxConsoleMessageCount);
     if (m_messages.size() == maxConsoleMessageCount) {
@@ skipping 10 matching lines @@
     if (V8InspectorSessionImpl* session = m_debugger->sessionForContextGroup(m_contextGroupId))
         session->releaseObjectGroup("console");
 }
 
 void V8ConsoleMessageStorage::contextDestroyed(int contextId)
 {
     for (size_t i = 0; i < m_messages.size(); ++i)
         m_messages[i]->contextDestroyed(contextId);
 }
 
-void V8ConsoleMessageStorage::notifyClear()
-{
-    if (V8InspectorSessionImpl* session = m_debugger->sessionForContextGroup(m_contextGroupId))
-        session->client()->consoleCleared();
-}
-
 } // namespace blink