[DevTools] Report unhandled exceptions and promise rejections through Runtime.

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

 /*
  * Copyright (c) 2010-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 67 matching lines @@
 std::unique_ptr<V8Debugger> V8Debugger::create(v8::Isolate* isolate, V8DebuggerClient* client)
 {
     return wrapUnique(new V8DebuggerImpl(isolate, client));
 }
 
 V8DebuggerImpl::V8DebuggerImpl(v8::Isolate* isolate, V8DebuggerClient* client)
     : m_isolate(isolate)
     , m_client(client)
     , m_capturingStackTracesCount(0)
     , m_muteConsoleCount(0)
-    , m_lastConsoleMessageId(0)
+    , m_lastExceptionId(0)
     , m_enabledAgentsCount(0)
     , m_breakpointsActivated(true)
     , m_runningNestedMessageLoop(false)
     , m_maxAsyncCallStackDepth(0)
 {
 }
 
 V8DebuggerImpl::~V8DebuggerImpl()
 {
 }
@@ skipping 910 matching lines @@
     if (!inspectedContext)
         return;
     std::vector<v8::Local<v8::Value>> arguments;
     if (!arg1.IsEmpty())
         arguments.push_back(arg1);
     if (!arg2.IsEmpty())
         arguments.push_back(arg2);
     ensureConsoleMessageStorage(contextGroupId)->addMessage(V8ConsoleMessage::createForConsoleAPI(m_client->currentTimeMS(), LogMessageType, LogMessageLevel, message, arguments.size() ? &arguments : nullptr, captureStackTrace(false), inspectedContext));
 }
 
-unsigned V8DebuggerImpl::promiseRejected(v8::Local<v8::Context> context, const String16& errorMessage, v8::Local<v8::Value> reason, const String16& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
+void V8DebuggerImpl::exceptionUnhandled(int contextGroupId, const String16& errorMessage, const String16& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
+{
+    if (m_muteConsoleCount || !contextGroupId)
+        return;
+    m_client->messageAddedToConsole(contextGroupId, JSMessageSource, ErrorMessageLevel, errorMessage, url, lineNumber, columnNumber, stackTrace.get());
+    unsigned exceptionId = ++m_lastExceptionId;
+    std::unique_ptr<V8ConsoleMessage> consoleMessage = V8ConsoleMessage::createForException(m_client->currentTimeMS(), errorMessage, url, lineNumber, columnNumber, std::move(stackTrace), scriptId, m_isolate, 0, v8::Local<v8::Value>(), exceptionId);
+    ensureConsoleMessageStorage(contextGroupId)->addMessage(std::move(consoleMessage));
+}
+
+unsigned V8DebuggerImpl::promiseRejected(v8::Local<v8::Context> context, const String16& errorMessage, v8::Local<v8::Value> exception, const String16& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
 {
     if (m_muteConsoleCount)
         return 0;
     int contextGroupId = getGroupId(context);
     if (!contextGroupId)
         return 0;
 
     const String16 defaultMessage = "Uncaught (in promise)";
     String16 message = errorMessage;
     if (message.isEmpty())
         message = defaultMessage;
     else if (message.startWith("Uncaught "))
         message = message.substring(0, 8) + " (in promise)" + message.substring(8);
 
     m_client->messageAddedToConsole(contextGroupId, JSMessageSource, ErrorMessageLevel, message, url, lineNumber, columnNumber, stackTrace.get());
-    std::unique_ptr<V8ConsoleMessage> consoleMessage = wrapUnique(new V8ConsoleMessage(m_client->currentTimeMS(), JSMessageSource, ErrorMessageLevel, message, url, lineNumber, columnNumber, std::move(stackTrace), scriptId, String16()));
-    unsigned id = ++m_lastConsoleMessageId;
-    consoleMessage->assignId(id);
-
-    std::vector<v8::Local<v8::Value>> arguments;
-    arguments.push_back(toV8String(m_isolate, defaultMessage));
-    arguments.push_back(reason);
-    consoleMessage->addArguments(m_isolate, contextId(context), &arguments);
-
+    unsigned exceptionId = ++m_lastExceptionId;
+    std::unique_ptr<V8ConsoleMessage> consoleMessage = V8ConsoleMessage::createForException(m_client->currentTimeMS(), message, url, lineNumber, columnNumber, std::move(stackTrace), scriptId, m_isolate, contextId(context), exception, exceptionId);
     ensureConsoleMessageStorage(contextGroupId)->addMessage(std::move(consoleMessage));
-    return id;
+    return exceptionId;
 }
 
 void V8DebuggerImpl::promiseRejectionRevoked(v8::Local<v8::Context> context, unsigned promiseRejectionId)
 {
     if (m_muteConsoleCount)
         return;
     int contextGroupId = getGroupId(context);
     if (!contextGroupId)
         return;
 
     const String16 message = "Handler added to rejected promise";
-    m_client->messageAddedToConsole(contextGroupId, JSMessageSource, RevokedErrorMessageLevel, message, String16(), 0, 0, nullptr);
-    std::unique_ptr<V8ConsoleMessage> consoleMessage = wrapUnique(new V8ConsoleMessage(m_client->currentTimeMS(), JSMessageSource, RevokedErrorMessageLevel, message, String16(), 0, 0, nullptr, 0, String16()));
-    consoleMessage->assignRelatedId(promiseRejectionId);
+    m_client->messageAddedToConsole(contextGroupId, JSMessageSource, InfoMessageLevel, message, String16(), 0, 0, nullptr);
+    std::unique_ptr<V8ConsoleMessage> consoleMessage = V8ConsoleMessage::createForRevokedException(m_client->currentTimeMS(), message, promiseRejectionId);
     ensureConsoleMessageStorage(contextGroupId)->addMessage(std::move(consoleMessage));
 }
 
 void V8DebuggerImpl::consoleMessagesCount(int contextGroupId, unsigned* total, unsigned* withArguments)
 {
     *total = 0;
     *withArguments = 0;
     ConsoleStorageMap::iterator storageIt = m_consoleStorageMap.find(contextGroupId);
     if (storageIt == m_consoleStorageMap.end())
         return;
@@ skipping 46 matching lines @@
 
 V8InspectorSessionImpl* V8DebuggerImpl::sessionForContextGroup(int contextGroupId)
 {
     if (!contextGroupId)
         return nullptr;
     SessionMap::iterator iter = m_sessions.find(contextGroupId);
     return iter == m_sessions.end() ? nullptr : iter->second;
 }
 
 } // namespace blink