V8 Inspector: remove V8ConsoleAPIType from the API, reuse v8::Isolate::MessageErrorLevel instead.

src/inspector/v8-console-message.cc

 // Copyright 2016 the V8 project 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 "src/inspector/v8-console-message.h"
 
 #include "src/inspector/inspected-context.h"
 #include "src/inspector/protocol/Protocol.h"
 #include "src/inspector/string-util.h"
 #include "src/inspector/v8-console-agent-impl.h"
@@ skipping 32 matching lines @@
       return protocol::Runtime::ConsoleAPICalled::TypeEnum::Trace;
     case ConsoleAPIType::kStartGroup:
       return protocol::Runtime::ConsoleAPICalled::TypeEnum::StartGroup;
     case ConsoleAPIType::kStartGroupCollapsed:
       return protocol::Runtime::ConsoleAPICalled::TypeEnum::StartGroupCollapsed;
     case ConsoleAPIType::kEndGroup:
       return protocol::Runtime::ConsoleAPICalled::TypeEnum::EndGroup;
     case ConsoleAPIType::kAssert:
       return protocol::Runtime::ConsoleAPICalled::TypeEnum::Assert;
     case ConsoleAPIType::kTimeEnd:
-      return protocol::Runtime::ConsoleAPICalled::TypeEnum::Debug;
+      return protocol::Runtime::ConsoleAPICalled::TypeEnum::TimeEnd;
     case ConsoleAPIType::kCount:
-      return protocol::Runtime::ConsoleAPICalled::TypeEnum::Debug;
+      return protocol::Runtime::ConsoleAPICalled::TypeEnum::Count;
   }
   return protocol::Runtime::ConsoleAPICalled::TypeEnum::Log;
 }
 
 const unsigned maxConsoleMessageCount = 1000;
 const unsigned maxArrayItemsLimit = 10000;
 const unsigned maxStackDepthLimit = 32;
 
 class V8ValueStringBuilder {
  public:
@@ skipping 305 matching lines @@
   message->m_stackTrace = std::move(stackTrace);
   message->m_type = type;
   message->m_contextId = contextId;
   for (size_t i = 0; i < arguments.size(); ++i)
     message->m_arguments.push_back(std::unique_ptr<v8::Global<v8::Value>>(
         new v8::Global<v8::Value>(isolate, arguments.at(i))));
   if (arguments.size())
     message->m_message = V8ValueStringBuilder::toString(arguments[0], context);
 
   V8ConsoleAPIType clientType = V8ConsoleAPIType::kLog;
+  v8::Isolate::MessageErrorLevel clientLevel = v8::Isolate::kMessageInfo;
   if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount ||
-      type == ConsoleAPIType::kTimeEnd)
+      type == ConsoleAPIType::kTimeEnd) {
     clientType = V8ConsoleAPIType::kDebug;
-  else if (type == ConsoleAPIType::kError || type == ConsoleAPIType::kAssert)
+    clientLevel = v8::Isolate::kMessageDebug;
+  } else if (type == ConsoleAPIType::kError ||
+             type == ConsoleAPIType::kAssert) {
     clientType = V8ConsoleAPIType::kError;
-  else if (type == ConsoleAPIType::kWarning)
+    clientLevel = v8::Isolate::kMessageError;
+  } else if (type == ConsoleAPIType::kWarning) {
     clientType = V8ConsoleAPIType::kWarning;
-  else if (type == ConsoleAPIType::kInfo)
+    clientLevel = v8::Isolate::kMessageWarning;
+  } else if (type == ConsoleAPIType::kInfo || type == ConsoleAPIType::kLog) {
     clientType = V8ConsoleAPIType::kInfo;
-  else if (type == ConsoleAPIType::kClear)
+    clientLevel = v8::Isolate::kMessageInfo;
+  } else if (type == ConsoleAPIType::kClear) {
     clientType = V8ConsoleAPIType::kClear;
+  }
+
   inspector->client()->consoleAPIMessage(
       contextGroupId, clientType, toStringView(message->m_message),
       toStringView(message->m_url), message->m_lineNumber,
       message->m_columnNumber, message->m_stackTrace.get());
 
+  if (type != ConsoleAPIType::kClear) {
+    inspector->client()->consoleAPIMessage(
+        contextGroupId, clientLevel, toStringView(message->m_message),
+        toStringView(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& detailedMessage, const String16& url,
     unsigned lineNumber, unsigned columnNumber,
     std::unique_ptr<V8StackTraceImpl> stackTrace, int scriptId,
     v8::Isolate* isolate, const String16& message, int contextId,
     v8::Local<v8::Value> exception, unsigned exceptionId) {
@@ skipping 70 matching lines @@
           m_inspector->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);
 }
 
 }  // namespace v8_inspector