DevTools: Get rid of WebInspector.ConsoleModel.UIDelegate

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 30 matching lines @@
     this.errors = 0;
     this._interruptRepeatCount = false;
     this._target = target;
     this._consoleAgent = target.consoleAgent();
     target.registerConsoleDispatcher(new WebInspector.ConsoleDispatcher(this));
 }
 
 WebInspector.ConsoleModel.Events = {
     ConsoleCleared: "console-cleared",
     MessageAdded: "console-message-added",
-    RepeatCountUpdated: "repeat-count-updated"
+    RepeatCountUpdated: "repeat-count-updated",
+    EvaluationResultMessageAdded: "evaluation-result-message-added",

[vsevik, 2014/03/20 13:22:46]

Let's name it CommandEvaluated and include original command text in the event.

While you are here, could you please make it look like ConsoleCleared:
"ConsoleCleared" instead for consistency with other DevTools code?

[sergeyv, 2014/03/20 13:34:03]

Done.

 }
 
 WebInspector.ConsoleModel.prototype = {
     enableAgent: function()
     {
         if (WebInspector.settings.monitoringXHREnabled.get())
             this._consoleAgent.setMonitoringXHREnabled(true);
 
         this._enablingConsole = true;
 
         /**
          * @this {WebInspector.ConsoleModel}
          */
         function callback()
         {
             delete this._enablingConsole;
         }
         this._consoleAgent.enable(callback.bind(this));
     },
 
     /**
      * @return {boolean}
      */
     enablingConsole: function()
     {
         return !!this._enablingConsole;
     },
 
     /**
-     * @param {!WebInspector.ConsoleModel.UIDelegate} delegate
-     */
-    setUIDelegate: function(delegate)
-    {
-        this._uiDelegate = delegate;
-    },
-
-    /**
      * @param {!WebInspector.ConsoleMessage} msg
      * @param {boolean=} isFromBackend
      */
     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 {?string} newPromptText
      * @param {boolean} useCommandLineAPI
      */
-    evaluateCommand: function(text, newPromptText, useCommandLineAPI)
+    evaluateCommand: function(text, useCommandLineAPI)
     {
-        if (!this._uiDelegate)
-            this.show();
+        this.show();
 
         var commandMessage = new WebInspector.ConsoleMessage(WebInspector.ConsoleMessage.MessageSource.JS, null, text, WebInspector.ConsoleMessage.MessageType.Command);
         this.addMessage(commandMessage);
 
-        if (newPromptText !== null)
-            this._uiDelegate.setPromptText(newPromptText);
-
         /**
          * @param {?WebInspector.RemoteObject} result
          * @param {boolean} wasThrown
          * @param {?RuntimeAgent.RemoteObject=} valueResult
          * @this {WebInspector.ConsoleModel}
          */
         function printResult(result, wasThrown, valueResult)
         {
             if (!result)
                 return;
 
-            this._uiDelegate.printEvaluationResult(result, wasThrown, text, commandMessage);
+            this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.EvaluationResultMessageAdded, {result: result, wasThrown: wasThrown, text: text, commandMessage: commandMessage});
         }
         this._target.runtimeModel.evaluate(text, "console", useCommandLineAPI, false, false, true, printResult.bind(this));
 
         WebInspector.userMetrics.ConsoleEvaluated.record();
     },
 
     show: function()
     {
         WebInspector.Revealer.reveal(this);
     },
 
     /**
      * @param {string} expression
      */
     evaluate: function(expression)
     {
-        this.evaluateCommand(expression, null, false);
+        this.evaluateCommand(expression, false);
     },
 
     /**
      * @param {string} messageText
      * @param {!WebInspector.ConsoleMessage.MessageLevel=} messageLevel
      * @param {boolean=} showConsole
      */
     log: function(messageText, messageLevel, showConsole)
     {
         var message = new WebInspector.ConsoleMessage(
@@ skipping 70 matching lines @@
             msgCopy.repeatCount = (count - prevRepeatCount) || 1;
             msgCopy.repeatDelta = msgCopy.repeatCount;
             this.addMessage(msgCopy, true);
         }
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
- * @interface
- */
-WebInspector.ConsoleModel.UIDelegate = function() { }
-
-WebInspector.ConsoleModel.UIDelegate.prototype = {
-    /**
-     * @param {string} text
-     */
-    setPromptText: function(text) { },
-
-    /**
-     * @param {?WebInspector.RemoteObject} result
-     * @param {boolean} wasThrown
-     * @param {string} promptText
-     * @param {!WebInspector.ConsoleMessage} commandMessage
-     */
-    printEvaluationResult: function(result, wasThrown, promptText, commandMessage) { }
-}
-
-/**
  * @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
@@ skipping 178 matching lines @@
     {
         if (!WebInspector.settings.preserveConsoleLog.get())
             this._console.clearMessages();
     }
 }
 
 /**
  * @type {!WebInspector.ConsoleModel}
  */
 WebInspector.console;