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

third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js

 /*
  * Copyright (C) 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 22 matching lines @@
  * @extends {WebInspector.SDKModel}
  * @param {!WebInspector.Target} target
  */
 WebInspector.ConsoleModel = function(target)
 {
     WebInspector.SDKModel.call(this, WebInspector.ConsoleModel, target);
 
     /** @type {!Array.<!WebInspector.ConsoleMessage>} */
     this._messages = [];
     /** @type {!Map<number, !WebInspector.ConsoleMessage>} */
-    this._messageById = new Map();
+    this._messageByExceptionId = new Map();
     this._warnings = 0;
     this._errors = 0;
     this._revokedErrors = 0;
     this._consoleAgent = target.consoleAgent();
     target.registerConsoleDispatcher(new WebInspector.ConsoleDispatcher(this));
     this._enableAgent();
 }
 
 WebInspector.ConsoleModel.Events = {
     ConsoleCleared: "ConsoleCleared",
@@ skipping 18 matching lines @@
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} msg
      */
     addMessage: function(msg)
     {
         if (this._isBlacklisted(msg))
             return;
 
-        if (msg.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError && msg._relatedMessageId) {
-            var relatedMessage = this._messageById.get(msg._relatedMessageId);
-            if (!relatedMessage)
+        if (msg.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError && msg._revokedExceptionId) {
+            var exceptionMessage = this._messageByExceptionId.get(msg._revokedExceptionId);
+            if (!exceptionMessage)
                 return;
             this._errors--;
             this._revokedErrors++;
-            relatedMessage.level = WebInspector.ConsoleMessage.MessageLevel.RevokedError;
-            this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, relatedMessage);
+            exceptionMessage.level = WebInspector.ConsoleMessage.MessageLevel.RevokedError;
+            this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, exceptionMessage);
             return;
         }
 
         this._messages.push(msg);
-        if (msg._messageId)
-            this._messageById.set(msg._messageId, msg);
+        if (msg._exceptionId)
+            this._messageByExceptionId.set(msg._exceptionId, msg);
         this._incrementErrorWarningCount(msg);
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, msg);
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} msg
      */
     _incrementErrorWarningCount: function(msg)
     {
         switch (msg.level) {
@@ skipping 35 matching lines @@
 
     requestClearMessages: function()
     {
         this._consoleAgent.clearMessages();
         this._messagesCleared();
     },
 
     _messagesCleared: function()
     {
         this._messages = [];
-        this._messageById.clear();
+        this._messageByExceptionId.clear();
         this._errors = 0;
         this._revokedErrors = 0;
         this._warnings = 0;
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
     },
 
     /**
      * @return {number}
      */
     errors: function()
@@ skipping 75 matching lines @@
  * @param {string=} type
  * @param {?string=} url
  * @param {number=} line
  * @param {number=} column
  * @param {!NetworkAgent.RequestId=} requestId
  * @param {!Array.<!RuntimeAgent.RemoteObject>=} parameters
  * @param {!RuntimeAgent.StackTrace=} stackTrace
  * @param {number=} timestamp
  * @param {!RuntimeAgent.ExecutionContextId=} executionContextId
  * @param {?string=} scriptId
- * @param {number=} messageId
- * @param {number=} relatedMessageId
  */
-WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, scriptId, messageId, relatedMessageId)
+WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, scriptId)
 {
     this._target = target;
     this.source = source;
     this.level = level;
     this.messageText = messageText;
     this.type = type || WebInspector.ConsoleMessage.MessageType.Log;
     /** @type {string|undefined} */
     this.url = url || undefined;
     /** @type {number} */
     this.line = line || 0;
     /** @type {number} */
     this.column = column || 0;
     this.parameters = parameters;
     /** @type {!RuntimeAgent.StackTrace|undefined} */
     this.stackTrace = stackTrace;
     this.timestamp = timestamp || Date.now();
     this.executionContextId = executionContextId || 0;
     this.scriptId = scriptId || null;
-    this._messageId = messageId || 0;
-    this._relatedMessageId = relatedMessageId || 0;
 
     var networkLog = target && WebInspector.NetworkLog.fromTarget(target);
     this.request = (requestId && networkLog) ? networkLog.requestForId(requestId) : null;
 
     if (this.request) {
         var initiator = this.request.initiator();
         if (initiator) {
             this.stackTrace = initiator.stack || undefined;
             if (initiator.url) {
                 this.url = initiator.url;
@@ skipping 23 matching lines @@
 
     /**
      * @param {!RuntimeAgent.ExecutionContextId} executionContextId
      */
     setExecutionContextId: function(executionContextId)
     {
         this.executionContextId = executionContextId;
     },
 
     /**
+     * @param {number} exceptionId
+     */
+    setExceptionId: function(exceptionId)
+    {
+        this._exceptionId = exceptionId;
+    },
+
+    /**
+     * @param {number} revokedExceptionId
+     */
+    setRevokedExceptionId: function(revokedExceptionId)
+    {
+        this._revokedExceptionId = revokedExceptionId;
+    },
+
+    /**
      * @return {?WebInspector.ConsoleMessage}
      */
     originatingMessage: function()
     {
         return this._originatingConsoleMessage;
     },
 
     /**
      * @return {boolean}
      */
@@ skipping 23 matching lines @@
 
     /**
      * @param {?WebInspector.ConsoleMessage} msg
      * @return {boolean}
      */
     isEqual: function(msg)
     {
         if (!msg)
             return false;
 
-        if (this._messageId || msg._messageId)
+        if (this._exceptionId || msg._exceptionId)
             return false;
-        if (this._relatedMessageId || msg._relatedMessageId)
+        if (this._revokedExceptionId || msg._revokedExceptionId)
             return false;
 
         if (!this._isEqualStackTraces(this.stackTrace, msg.stackTrace))
             return false;
 
         if (this.parameters) {
             if (!msg.parameters || this.parameters.length !== msg.parameters.length)
                 return false;
 
             for (var i = 0; i < msg.parameters.length; ++i) {
@@ skipping 81 matching lines @@
 
 /**
  * @enum {string}
  */
 WebInspector.ConsoleMessage.MessageLevel = {
     Log: "log",
     Info: "info",
     Warning: "warning",
     Error: "error",
     Debug: "debug",
-    RevokedError: "revokedError"
+    RevokedError: "revokedError"  // This is frontend-only level, used to put exceptions to console.
 };
 
 /**
  * @param {!WebInspector.ConsoleMessage} a
  * @param {!WebInspector.ConsoleMessage} b
  * @return {number}
  */
 WebInspector.ConsoleMessage.timestampComparator = function(a, b)
 {
     return a.timestamp - b.timestamp;
@@ skipping 23 matching lines @@
             payload.text,
             payload.type,
             payload.url,
             payload.line,
             payload.column,
             payload.networkRequestId,
             payload.parameters,
             payload.stack,
             payload.timestamp * 1000, // Convert to ms.
             payload.executionContextId,
-            payload.scriptId,
-            payload.messageId,
-            payload.relatedMessageId);
+            payload.scriptId);
         this._console.addMessage(consoleMessage);
     },
 
     /**
      * @override
      * @param {number} count
      */
     messageRepeatCountUpdated: function(count)
     {
     },
@@ skipping 87 matching lines @@
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, event.data);
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @type {!WebInspector.MultitargetConsoleModel}
  */
 WebInspector.multitargetConsoleModel;