DevTools: Make ConsoleMessage TargetAware

Source/devtools/front_end/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 117 matching lines @@
     this._updateFilterStatus();
     WebInspector.settings.consoleTimestampsEnabled.addChangeListener(this._consoleTimestampsSettingChanged, this);
 }
 
 WebInspector.ConsoleView.prototype = {
     /**
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
-        target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded.bind(this, target), this);
+        target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
         target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
         target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.CommandEvaluated, this._commandEvaluated, this);
-        target.consoleModel.messages.forEach(this._consoleMessageAdded.bind(this, target));
+        target.consoleModel.messages.forEach(this._consoleMessageAdded, this);
 
         /**
          * @param {!WebInspector.ExecutionContextList} contextList
          * @this {WebInspector.ConsoleView}
          */
         function loadContextList(contextList)
         {
             this._addExecutionContextList(target, contextList);
             this._contextListChanged(target, contextList);
         }
@@ skipping 270 matching lines @@
      */
     _updateFilterStatus: function(count) {
         count = (typeof count === "undefined") ? (this._consoleMessages.length - this._visibleViewMessages.length) : count;
         this._filterStatusTextElement.textContent = WebInspector.UIString(count == 1 ? "%d message is hidden by filters." : "%d messages are hidden by filters.", count);
         this._filterStatusMessageElement.style.display = count ? "" : "none";
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} message
      */
-    _consoleMessageAdded: function(target, message)
+    _consoleMessageAdded: function(message)
     {
         if (this._urlToMessageCount[message.url])
             this._urlToMessageCount[message.url]++;
         else
             this._urlToMessageCount[message.url] = 1;
 
         var previousMessage = this._consoleMessages.peekLast();
         if (previousMessage && !message.isGroupMessage() && message.isEqual(previousMessage)) {
             previousMessage.timestamp = message.timestamp;
             this._messageToViewMessage.get(previousMessage).incrementRepeatCount();
             return;
         }
 
         this._consoleMessages.push(message);
-        var viewMessage = this._createViewMessage(target, message);
+        var viewMessage = this._createViewMessage(message);
 
         if (this._filter.shouldBeVisible(viewMessage))
             this._showConsoleMessage(viewMessage);
         else
             this._updateFilterStatus();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
-    _onConsoleMessageAdded: function(target, event)
+    _onConsoleMessageAdded: function(event)
     {
         var message = /** @type {!WebInspector.ConsoleMessage} */ (event.data);
-        this._consoleMessageAdded(target, message);
+        this._consoleMessageAdded(message);
     },
 
     /**
      * @param {!WebInspector.ConsoleViewMessage} viewMessage
      */
     _showConsoleMessage: function(viewMessage)
     {
         var message = viewMessage.consoleMessage();
 
         // this.messagesElement.isScrolledToBottom() is forcing style recalculation.
@@ skipping 20 matching lines @@
         if (this._searchRegex && viewMessage.matchesRegex(this._searchRegex)) {
             this._searchResults.push(viewMessage);
             this._searchableView.updateSearchMatchesCount(this._searchResults.length);
         }
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} message
      * @return {!WebInspector.ConsoleViewMessage}
      */
-    _createViewMessage: function(target, message)
+    _createViewMessage: function(message)
     {
         var viewMessage = this._messageToViewMessage.get(message);
         if (viewMessage)
             return viewMessage;
         if (message.type === WebInspector.ConsoleMessage.MessageType.Command)
-            viewMessage = new WebInspector.ConsoleCommand(target, message);
+            viewMessage = new WebInspector.ConsoleCommand(message);
         else
-            viewMessage = new WebInspector.ConsoleViewMessage(target, message, this._linkifier);
+            viewMessage = new WebInspector.ConsoleViewMessage(message, this._linkifier);
         this._messageToViewMessage.put(message, viewMessage);
         return viewMessage;
     },
 
     _consoleCleared: function()
     {
         this._scrolledToBottom = true;
         this._clearCurrentSearchResultHighlight();
         this._updateFilterStatus(0);
 
@@ skipping 472 matching lines @@
 
     __proto__: WebInspector.Object.prototype
 };
 
 
 /**
  * @constructor
  * @extends {WebInspector.ConsoleViewMessage}
  * @param {!WebInspector.ConsoleMessage} message
  */
-WebInspector.ConsoleCommand = function(target, message)
+WebInspector.ConsoleCommand = function(message)
 {
-    WebInspector.ConsoleViewMessage.call(this, target, message, null);
+    WebInspector.ConsoleViewMessage.call(this, message, null);
 }
 
 WebInspector.ConsoleCommand.prototype = {
     wasShown: function()
     {
     },
 
     willHide: function()
     {
     },
@@ skipping 52 matching lines @@
     {
         this._formattedCommand = document.createElement("span");
         this._formattedCommand.className = "console-message-text source-code";
         this._formattedCommand.textContent = this.text;
     },
 
     __proto__: WebInspector.ConsoleViewMessage.prototype
 }
 
 /**
+ * @constructor
  * @extends {WebInspector.ConsoleViewMessage}
- * @constructor
  * @param {!WebInspector.RemoteObject} result
  * @param {boolean} wasThrown
  * @param {?WebInspector.ConsoleCommand} originatingCommand
  * @param {!WebInspector.Linkifier} linkifier
  * @param {string=} url
  * @param {number=} lineNumber
  * @param {number=} columnNumber
  */
 WebInspector.ConsoleCommandResult = function(result, wasThrown, originatingCommand, linkifier, url, lineNumber, columnNumber)
 {
     this.originatingCommand = originatingCommand;
     var level = wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error : WebInspector.ConsoleMessage.MessageLevel.Log;
-
-    var message = new WebInspector.ConsoleMessage(WebInspector.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.MessageType.Result, url, lineNumber, columnNumber, undefined, [result]);
-    WebInspector.ConsoleViewMessage.call(this, /** @type {!WebInspector.Target} */ (result.target()), message, linkifier);
+    var message = new WebInspector.ConsoleMessage(/** @type {!WebInspector.Target} */ (result.target()), WebInspector.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.MessageType.Result, url, lineNumber, columnNumber, undefined, [result]);
+    WebInspector.ConsoleViewMessage.call(this, message, linkifier);
 }
 
 WebInspector.ConsoleCommandResult.prototype = {
     /**
      * @override
      * @param {!WebInspector.RemoteObject} array
      * @return {boolean}
      */
     useArrayPreviewInFormatter: function(array)
     {
@@ skipping 103 matching lines @@
 WebInspector.ConsoleView.ShowConsoleActionDelegate.prototype = {
     /**
      * @return {boolean}
      */
     handleAction: function()
     {
         WebInspector.console.show();
         return true;
     }
 }