Merge WebKit console and load deferrer changes.

webkit/glue/devtools/js/devtools.js

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Tools is a main class that wires all components of the 
  * DevTools frontend together. It is also responsible for overriding existing
  * WebInspector functionality while it is getting upstreamed into WebCore.
  */
 goog.provide('devtools.Tools');
@@ skipping 84 matching lines @@
  */
 devtools.ToolsAgent.prototype.frameNavigate = function(url, topLevel) {
   if (topLevel) {
     this.reset();
     WebInspector.reset();
   }
 };
 
 
 /**
- * @param {string} message Message to add.
- * @param {string} source Source url.
- * @param {number} line Line number in source.
+ * @param {Object} message Message object to add.
  * @see tools_agent.h
  */
-devtools.ToolsAgent.prototype.addMessageToConsole = function(message, source,
-    line) {
+devtools.ToolsAgent.prototype.addMessageToConsole = function(message) {
   var console = WebInspector.console;
   if (console) {
     console.addMessage(new WebInspector.ConsoleMessage(
-        '', undefined, line, source, undefined, 1, message));
+        message.source, message.level, message.line, message.sourceId,
+        undefined, 1, message.text));
   }
 };
 
 
 /**
  * Evaluates js expression.
  * @param {string} expr
  */
 devtools.ToolsAgent.prototype.evaluate = function(expr) {
   RemoteToolsAgent.evaluate(expr);
@@ skipping 427 matching lines @@
  */
  WebInspector.ScopeChainSidebarPane.TreeElement.prototype.didResolveChildren_ =
     function(object) {
   this.removeChildren();
   
   var constructor = this.treeOutline.section.treeElementConstructor;
   for (var name in object) {
     this.appendChild(new constructor(object, name));
   }
 };