DevTools: Remove event Console.messageRepeatCountUpdated

Source/devtools/front_end/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.Object}
  * @param {!WebInspector.Target} target
  */
 WebInspector.ConsoleModel = function(target)
 {
     /** @type {!Array.<!WebInspector.ConsoleMessage>} */
     this.messages = [];
     this.warnings = 0;
     this.errors = 0;
-    this._interruptRepeatCount = false;
     this._target = target;
     this._consoleAgent = target.consoleAgent();
     target.registerConsoleDispatcher(new WebInspector.ConsoleDispatcher(this));
     this._enableAgent();
 }
 
 WebInspector.ConsoleModel.Events = {
     ConsoleCleared: "ConsoleCleared",
     MessageAdded: "MessageAdded",
-    RepeatCountUpdated: "RepeatCountUpdated",
     CommandEvaluated: "CommandEvaluated",
 }
 
 WebInspector.ConsoleModel.prototype = {
     _enableAgent: function()
     {
         if (WebInspector.settings.monitoringXHREnabled.get())
             this._consoleAgent.setMonitoringXHREnabled(true);
 
         this._enablingConsole = true;
@@ skipping 22 matching lines @@
      */
     addMessage: function(msg, isFromBackend)
     {
         if (isFromBackend && WebInspector.SourceMap.hasSourceMapRequestHeader(msg.request))
             return;
 
         msg.index = this.messages.length;
         this.messages.push(msg);
         this._incrementErrorWarningCount(msg);
 
-        if (isFromBackend)
-            this._previousMessage = msg;
-
-        this._interruptRepeatCount = !isFromBackend;
-
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, msg);
     },
 
     /**
      * @param {string} text
      * @param {boolean} useCommandLineAPI
      */
     evaluateCommand: function(text, useCommandLineAPI)
     {
         this.show();
@@ skipping 57 matching lines @@
         this.log(error, WebInspector.ConsoleMessage.MessageLevel.Error, true);
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} msg
      */
     _incrementErrorWarningCount: function(msg)
     {
         switch (msg.level) {
             case WebInspector.ConsoleMessage.MessageLevel.Warning:
-                this.warnings += msg.repeatDelta;
+                this.warnings += 1;

[pfeldman, 2014/03/25 13:09:32]

++

[sergeyv, 2014/03/25 13:42:56]

Done.

                 break;
             case WebInspector.ConsoleMessage.MessageLevel.Error:
-                this.errors += msg.repeatDelta;
+                this.errors += 1;
                 break;
         }
     },
 
     requestClearMessages: function()
     {
         this._consoleAgent.clearMessages();
         this.clearMessages();
     },
 
     clearMessages: function()
     {
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
 
         this.messages = [];
-        delete this._previousMessage;
-
         this.errors = 0;
         this.warnings = 0;
     },
 
-    /**
-     * @param {number} count
-     */
-    _messageRepeatCountUpdated: function(count)
-    {
-        var msg = this._previousMessage;
-        if (!msg)
-            return;
-
-        var prevRepeatCount = msg.totalRepeatCount;
-
-        if (!this._interruptRepeatCount) {
-            msg.repeatDelta = count - prevRepeatCount;
-            msg.repeatCount = msg.repeatCount + msg.repeatDelta;
-            msg.totalRepeatCount = count;
-
-            this._incrementErrorWarningCount(msg);
-            this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.RepeatCountUpdated, msg);
-        } else {
-            var msgCopy = msg.clone();
-            msgCopy.totalRepeatCount = count;
-            msgCopy.repeatCount = (count - prevRepeatCount) || 1;
-            msgCopy.repeatDelta = msgCopy.repeatCount;
-            this.addMessage(msgCopy, true);
-        }
-    },
-
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @constructor
  * @param {string} source
  * @param {?string} level
  * @param {string} messageText
  * @param {string=} type
  * @param {?string=} url
  * @param {number=} line
  * @param {number=} column
- * @param {number=} repeatCount
  * @param {!NetworkAgent.RequestId=} requestId
  * @param {!Array.<!RuntimeAgent.RemoteObject>=} parameters
  * @param {!Array.<!ConsoleAgent.CallFrame>=} stackTrace
  * @param {boolean=} isOutdated
  */
-WebInspector.ConsoleMessage = function(source, level, messageText, type, url, line, column, repeatCount, requestId, parameters, stackTrace, isOutdated)
+WebInspector.ConsoleMessage = function(source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, isOutdated)
 {
     this.source = source;
     this.level = level;
     this.messageText = messageText;
     this.type = type || WebInspector.ConsoleMessage.MessageType.Log;
     this.url = url || null;
     this.line = line || 0;
     this.column = column || 0;
     this.parameters = parameters;
     this.stackTrace = stackTrace;
     this.isOutdated = isOutdated;
-
-    repeatCount = repeatCount || 1;
-    this.repeatCount = repeatCount;
-    this.repeatDelta = repeatCount;
-    this.totalRepeatCount = repeatCount;
     this.request = requestId ? WebInspector.networkLog.requestForId(requestId) : null;
 }
 
 WebInspector.ConsoleMessage.prototype = {
+
     /**
      * @return {boolean}
      */
+    isGroupMessage: function()
+    {
+        return this.type === WebInspector.ConsoleMessage.MessageType.StartGroup ||
+            this.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed ||
+            this.type === WebInspector.ConsoleMessage.MessageType.EndGroup;
+    },
+
+    /**
+     * @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.source,
             this.level,
             this.messageText,
             this.type,
             this.url,
             this.line,
             this.column,
-            this.repeatCount,
             this.request ? this.request.requestId : undefined,
             this.parameters,
             this.stackTrace,
             this.isOutdated);
     },
 
     /**
+     * @param {!Array.<!RuntimeAgent.RemoteObject>=} parameters
+     * @return {boolean}
+     */
+    _equalParameters: function(parameters)
+    {
+        if (!this.parameters && !parameters)
+            return true;
+
+        if (!this.parameters || !parameters || this.parameters.length !== parameters.length)
+            return false;
+
+        for (var i = 0; i < parameters.length; ++i) {
+            // Never treat objects as equal - their properties might change over time.
+            if (this.parameters[i].type !== parameters[i].type || parameters[i].type === "object" || this.parameters[i].value !== parameters[i].value)
+                return false;
+        }
+
+        return true;
+    },
+
+    /**
      * @param {?WebInspector.ConsoleMessage} msg
      * @return {boolean}
      */
     isEqual: function(msg)
     {
         if (!msg)
             return false;
 
         if (this.stackTrace) {
             if (!msg.stackTrace)
@@ skipping 10 matching lines @@
                     return false;
             }
         }
 
         return (this.source === msg.source)
             && (this.type === msg.type)
             && (this.level === msg.level)
             && (this.line === msg.line)
             && (this.url === msg.url)
             && (this.messageText === msg.messageText)
-            && (this.request === msg.request);
+            && (this.request === msg.request) && this._equalParameters(msg.parameters);

[pfeldman, 2014/03/25 13:09:32]

inline.

[sergeyv, 2014/03/25 13:42:56]

Done.

     }
 }
 
 // Note: Keep these constants in sync with the ones in Console.h
 /**
  * @enum {string}
  */
 WebInspector.ConsoleMessage.MessageSource = {
     XML: "xml",
     JS: "javascript",
@@ skipping 56 matching lines @@
     messageAdded: function(payload)
     {
         var consoleMessage = new WebInspector.ConsoleMessage(
             payload.source,
             payload.level,
             payload.text,
             payload.type,
             payload.url,
             payload.line,
             payload.column,
-            payload.repeatCount,
             payload.networkRequestId,
             payload.parameters,
             payload.stackTrace,
             this._console._enablingConsole);
         this._console.addMessage(consoleMessage, true);
     },
 
     /**
      * @param {number} count
      */
-    messageRepeatCountUpdated: function(count)
-    {
-        this._console._messageRepeatCountUpdated(count);
-    },
+    messageRepeatCountUpdated: function(count){},

[pfeldman, 2014/03/25 13:09:32]

     )
{
},

[sergeyv, 2014/03/25 13:42:56]

Done.

 
     messagesCleared: function()
     {
         if (!WebInspector.settings.preserveConsoleLog.get())
             this._console.clearMessages();
     }
 }
 
 /**
  * @type {!WebInspector.ConsoleModel}
  */
 WebInspector.console;