DevTools: Make ConsoleMessage TargetAware

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 84 matching lines @@
     },
 
     /**
      * @param {string} text
      * @param {boolean} useCommandLineAPI
      */
     evaluateCommand: function(text, useCommandLineAPI)
     {
         this.show();
 
-        var commandMessage = new WebInspector.ConsoleMessage(WebInspector.ConsoleMessage.MessageSource.JS, null, text, WebInspector.ConsoleMessage.MessageType.Command);
+        var commandMessage = new WebInspector.ConsoleMessage(this.target(), WebInspector.ConsoleMessage.MessageSource.JS, null, text, WebInspector.ConsoleMessage.MessageType.Command);
         this.addMessage(commandMessage);
 
         /**
          * @param {?WebInspector.RemoteObject} result
          * @param {boolean} wasThrown
          * @param {?RuntimeAgent.RemoteObject=} valueResult
          * @this {WebInspector.ConsoleModel}
          */
         function printResult(result, wasThrown, valueResult)
         {
@@ skipping 21 matching lines @@
     },
 
     /**
      * @param {string} messageText
      * @param {!WebInspector.ConsoleMessage.MessageLevel=} messageLevel
      * @param {boolean=} showConsole
      */
     log: function(messageText, messageLevel, showConsole)
     {
         var message = new WebInspector.ConsoleMessage(
+            this.target(),
             WebInspector.ConsoleMessage.MessageSource.Other,
             messageLevel || WebInspector.ConsoleMessage.MessageLevel.Debug,
             messageText);
 
         this.addMessage(message);
         if (showConsole)
             this.show();
     },
 
     /**
@@ skipping 32 matching lines @@
         this.messages = [];
         this.errors = 0;
         this.warnings = 0;
     },
 
     __proto__: WebInspector.TargetAwareObject.prototype
 }
 
 /**
  * @constructor
+ * @extends {WebInspector.TargetAware}
+ * @param {!WebInspector.Target} target
  * @param {string} source
  * @param {?string} level
  * @param {string} messageText
  * @param {string=} type
  * @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 {boolean=} isOutdated
  * @param {!RuntimeAgent.ExecutionContextId=} executionContextId
  */
-
-WebInspector.ConsoleMessage = function(source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, isOutdated, executionContextId)
+WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, isOutdated, executionContextId)
 {
+    WebInspector.TargetAware.call(this, target);
     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.timestamp = timestamp || Date.now();
@@ skipping 22 matching lines @@
     {
         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,
@@ skipping 35 matching lines @@
             }
         }
 
         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);
-    }
+    },
+
+    __proto__: WebInspector.TargetAware.prototype
 }
 
 // Note: Keep these constants in sync with the ones in Console.h
 /**
  * @enum {string}
  */
 WebInspector.ConsoleMessage.MessageSource = {
     XML: "xml",
     JS: "javascript",
     Network: "network",
@@ skipping 48 matching lines @@
     this._console = console;
 }
 
 WebInspector.ConsoleDispatcher.prototype = {
     /**
      * @param {!ConsoleAgent.ConsoleMessage} payload
      */
     messageAdded: function(payload)
     {
         var consoleMessage = new WebInspector.ConsoleMessage(
+            this._console.target(),
             payload.source,
             payload.level,
             payload.text,
             payload.type,
             payload.url,
             payload.line,
             payload.column,
             payload.networkRequestId,
             payload.parameters,
             payload.stackTrace,
@@ skipping 14 matching lines @@
     {
         if (!WebInspector.settings.preserveConsoleLog.get())
             this._console.clearMessages();
     }
 }
 
 /**
  * @type {!WebInspector.ConsoleModel}
  */
 WebInspector.console;