Merge WebKit console and load deferrer changes.

webkit/glue/devtools/js/devtools.js

Index: webkit/glue/devtools/js/devtools.js
===================================================================
--- webkit/glue/devtools/js/devtools.js	(revision 14719)
+++ webkit/glue/devtools/js/devtools.js	(working copy)
@@ -102,17 +102,15 @@
 
 
 /**
- * @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));
   }
 };