Revert of DevTools: [console] Logged promise rejections do not change state once handled

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 21 matching lines @@
  * @constructor
  * @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._warnings = 0;
-    this._errors = 0;
-    this._revokedErrors = 0;
+    this.warnings = 0;
+    this.errors = 0;
     this._consoleAgent = target.consoleAgent();
     target.registerConsoleDispatcher(new WebInspector.ConsoleDispatcher(this));
     this._enableAgent();
 }
 
 WebInspector.ConsoleModel.Events = {
     ConsoleCleared: "ConsoleCleared",
     MessageAdded: "MessageAdded",
-    MessageUpdated: "MessageUpdated",
     CommandEvaluated: "CommandEvaluated",
 }
 
 WebInspector.ConsoleModel.prototype = {
     _enableAgent: function()
     {
         this._enablingConsole = true;
 
         /**
          * @this {WebInspector.ConsoleModel}
          */
         function callback()
         {
             delete this._enablingConsole;
         }
         this._consoleAgent.enable(callback.bind(this));
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} msg
      */
     addMessage: function(msg)
     {
-        if (msg.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError && msg._relatedMessageId) {
-            var relatedMessage = this._messageById.get(msg._relatedMessageId);
-            if (!relatedMessage)
-                return;
-            this._errors--;
-            this._revokedErrors++;
-            relatedMessage.level = WebInspector.ConsoleMessage.MessageLevel.RevokedError;
-            this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, relatedMessage);
-            return;
-        }
+        msg.index = this._messages.length;
+        this._messages.push(msg);
+        this._incrementErrorWarningCount(msg);
 
-        this._messages.push(msg);
-        if (msg._messageId)
-            this._messageById.set(msg._messageId, msg);
-        this._incrementErrorWarningCount(msg);
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, msg);
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} msg
      */
     _incrementErrorWarningCount: function(msg)
     {
         switch (msg.level) {
             case WebInspector.ConsoleMessage.MessageLevel.Warning:
-                this._warnings++;
+                this.warnings++;
                 break;
             case WebInspector.ConsoleMessage.MessageLevel.Error:
-                this._errors++;
-                break;
-            case WebInspector.ConsoleMessage.MessageLevel.RevokedError:
-                this._revokedErrors++;
+                this.errors++;
                 break;
         }
     },
 
     /**
      * @return {!Array.<!WebInspector.ConsoleMessage>}
      */
     messages: function()
     {
         return this._messages;
     },
 
     requestClearMessages: function()
     {
         this._consoleAgent.clearMessages();
         this._messagesCleared();
     },
 
     _messagesCleared: function()
     {
         this._messages = [];
-        this._messageById.clear();
-        this._errors = 0;
-        this._revokedErrors = 0;
-        this._warnings = 0;
+        this.errors = 0;
+        this.warnings = 0;
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
     },
 
-    /**
-     * @return {number}
-     */
-    errors: function()
-    {
-        return this._errors;
-    },
-
-    /**
-     * @return {number}
-     */
-    revokedErrors: function()
-    {
-        return this._revokedErrors;
-    },
-
-    /**
-     * @return {number}
-     */
-    warnings: function()
-    {
-        return this._warnings;
-    },
-
     __proto__: WebInspector.SDKModel.prototype
 }
 
 /**
  * @param {!WebInspector.ExecutionContext} executionContext
  * @param {string} text
  * @param {boolean=} useCommandLineAPI
  */
 WebInspector.ConsoleModel.evaluateCommandInConsole = function(executionContext, text, useCommandLineAPI)
 {
@@ skipping 38 matching lines @@
  * @param {?string=} url
  * @param {number=} line
  * @param {number=} column
  * @param {!NetworkAgent.RequestId=} requestId
  * @param {!Array.<!RuntimeAgent.RemoteObject>=} parameters
  * @param {!Array.<!ConsoleAgent.CallFrame>=} stackTrace
  * @param {number=} timestamp
  * @param {!RuntimeAgent.ExecutionContextId=} executionContextId
  * @param {!ConsoleAgent.AsyncStackTrace=} asyncStackTrace
  * @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, asyncStackTrace, scriptId, messageId, relatedMessageId)
+WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, asyncStackTrace, 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 {!Array.<!ConsoleAgent.CallFrame>|undefined} */
     this.stackTrace = stackTrace;
     this.timestamp = timestamp || Date.now();
     this.executionContextId = executionContextId || 0;
     this.asyncStackTrace = asyncStackTrace;
     this.scriptId = scriptId || null;
-    this._messageId = messageId || 0;
-    this._relatedMessageId = relatedMessageId || 0;
 
     this.request = requestId ? target.networkLog.requestForId(requestId) : null;
 
     if (this.request) {
         var initiator = this.request.initiator();
         if (initiator) {
             this.stackTrace = initiator.stackTrace || undefined;
             this.asyncStackTrace = initiator.asyncStackTrace;
             if (initiator.url) {
                 this.url = initiator.url;
@@ skipping 58 matching lines @@
 
     /**
      * @return {boolean}
      */
     isErrorOrWarning: function()
     {
         return (this.level === WebInspector.ConsoleMessage.MessageLevel.Warning || this.level === WebInspector.ConsoleMessage.MessageLevel.Error);
     },
 
     /**
+     * @return {!WebInspector.ConsoleMessage}
+     */
+    clone: function()
+    {
+        return new WebInspector.ConsoleMessage(
+            this.target(),
+            this.source,
+            this.level,
+            this.messageText,
+            this.type,
+            this.url,
+            this.line,
+            this.column,
+            this.request ? this.request.requestId : undefined,
+            this.parameters,
+            this.stackTrace,
+            this.timestamp,
+            this.executionContextId,
+            this.asyncStackTrace,
+            this.scriptId);
+    },
+
+    /**
      * @param {?WebInspector.ConsoleMessage} msg
      * @return {boolean}
      */
     isEqual: function(msg)
     {
         if (!msg)
             return false;
 
-        if (this._messageId || msg._messageId)
-            return false;
-        if (this._relatedMessageId || msg._relatedMessageId)
-            return false;
-
         if (!this._isEqualStackTraces(this.stackTrace, msg.stackTrace))
             return false;
 
         var asyncTrace1 = this.asyncStackTrace;
         var asyncTrace2 = msg.asyncStackTrace;
         while (asyncTrace1 || asyncTrace2) {
             if (!asyncTrace1 || !asyncTrace2)
                 return false;
             if (asyncTrace1.description !== asyncTrace2.description)
                 return false;
@@ skipping 87 matching lines @@
 }
 
 /**
  * @enum {string}
  */
 WebInspector.ConsoleMessage.MessageLevel = {
     Log: "log",
     Info: "info",
     Warning: "warning",
     Error: "error",
-    Debug: "debug",
-    RevokedError: "revokedError"
+    Debug: "debug"
 };
 
 /**
  * @param {!WebInspector.ConsoleMessage} a
  * @param {!WebInspector.ConsoleMessage} b
  * @return {number}
  */
 WebInspector.ConsoleMessage.timestampComparator = function (a, b)
 {
     return a.timestamp - b.timestamp;
@@ skipping 24 matching lines @@
             payload.type,
             payload.url,
             payload.line,
             payload.column,
             payload.networkRequestId,
             payload.parameters,
             payload.stackTrace,
             payload.timestamp * 1000, // Convert to ms.
             payload.executionContextId,
             payload.asyncStackTrace,
-            payload.scriptId,
-            payload.messageId,
-            payload.relatedMessageId);
+            payload.scriptId);
         this._console.addMessage(consoleMessage);
     },
 
     /**
      * @override
      * @param {number} count
      */
     messageRepeatCountUpdated: function(count)
     {
     },
@@ skipping 10 matching lines @@
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.MultitargetConsoleModel = function()
 {
     WebInspector.targetManager.observeTargets(this);
     WebInspector.targetManager.addModelListener(WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageAdded, this._consoleMessageAdded, this);
-    WebInspector.targetManager.addModelListener(WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageUpdated, this._consoleMessageUpdated, this);
     WebInspector.targetManager.addModelListener(WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.CommandEvaluated, this._commandEvaluated, this);
 }
 
 WebInspector.MultitargetConsoleModel.prototype = {
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
@@ skipping 36 matching lines @@
      * @param {!WebInspector.Event} event
      */
     _consoleMessageAdded: function(event)
     {
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, event.data);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
-    _consoleMessageUpdated: function(event)
-    {
-        this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, event.data);
-    },
-
-    /**
-     * @param {!WebInspector.Event} event
-     */
     _commandEvaluated: function(event)
     {
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, event.data);
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @type {!WebInspector.MultitargetConsoleModel}
  */
 WebInspector.multitargetConsoleModel;