DevTools: Get rid of WebInspector.ConsoleModel.UIDelegate

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 11 matching lines @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @extends {WebInspector.VBox}
- * @implements {WebInspector.ConsoleModel.UIDelegate}
  * @implements {WebInspector.Searchable}
  * @constructor
  * @param {boolean} hideContextSelector
  */
 WebInspector.ConsoleView = function(hideContextSelector)
 {
     WebInspector.VBox.call(this);
     this.registerRequiredCSS("filter.css");
 
     this._searchableView = new WebInspector.SearchableView(this);
@@ skipping 51 matching lines @@
     this._registerShortcuts();
     this.registerRequiredCSS("textPrompt.css");
 
     this.messagesElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
 
     WebInspector.settings.monitoringXHREnabled.addChangeListener(this._monitoringXHREnabledSettingChanged.bind(this));
 
     WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
     WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
     WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.RepeatCountUpdated, this._repeatCountUpdated, this);
+    WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.EvaluationResultMessageAdded, this._printEvaluationResult, this);

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

this._commandEvaluated

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

Done.

 
     this._linkifier = new WebInspector.Linkifier();
 
     /** @type {!Map.<!WebInspector.ConsoleMessage, !WebInspector.ConsoleViewMessage>} */
     this._messageToViewMessage = new Map();
     /** @type {!Array.<!WebInspector.ConsoleMessage>} */
     this._consoleMessages = [];
 
     this.prompt = new WebInspector.TextPromptWithHistory(WebInspector.runtimeModel.completionsForTextPrompt.bind(WebInspector.runtimeModel));
     this.prompt.setSuggestBoxEnabled("generic-suggest");
@@ skipping 549 matching lines @@
         if (event.altKey || event.ctrlKey || event.shiftKey)
             return;
 
         event.consume(true);
 
         this.prompt.clearAutoComplete(true);
 
         var str = this.prompt.text;
         if (!str.length)
             return;
-        this._appendCommand(str, "", true);
+        this._appendCommand(str, true);
     },
 
     /**
      * @param {?WebInspector.RemoteObject} result
      * @param {boolean} wasThrown
      * @param {?WebInspector.ConsoleCommand} originatingCommand
      */
     _printResult: function(result, wasThrown, originatingCommand)
     {
         if (!result)
@@ skipping 40 matching lines @@
                 url = script.sourceURL;
                 lineNumber = response.location.lineNumber + 1;
                 columnNumber = response.location.columnNumber + 1;
             }
             addMessage.call(this, url, lineNumber, columnNumber);
         }
     },
 
     /**
      * @param {string} text
-     * @param {string} newPromptText
      * @param {boolean} useCommandLineAPI
      */
-    _appendCommand: function(text, newPromptText, useCommandLineAPI)
+    _appendCommand: function(text, useCommandLineAPI)
     {
-        WebInspector.console.evaluateCommand(text, newPromptText, useCommandLineAPI);
+        this.prompt.text = "";
+        WebInspector.console.evaluateCommand(text, useCommandLineAPI);
     },
 
     /**
-     * @override
-     * @param {string} text
+     * @param {!WebInspector.Event} event
      */
-    setPromptText: function(text)
+    _printEvaluationResult: function(event)
     {
-        this.prompt.text = text;
+        var data = /**{{result: ?WebInspector.RemoteObject, wasThrown: boolean, text: string, commandMessage: !WebInspector.ConsoleMessage}} */ (event.data);
+        this.prompt.pushHistoryItem(data.text);
+        WebInspector.settings.consoleHistory.set(this.prompt.historyData.slice(-30));
+        this._printResult(data.result, data.wasThrown, /** @type {!WebInspector.ConsoleCommand} */ (this._messageToViewMessage.get(data.commandMessage)));
     },
 
     /**
-     * @override
-     * @param {?WebInspector.RemoteObject} result
-     * @param {boolean} wasThrown
-     * @param {string} promptText
-     * @param {!WebInspector.ConsoleMessage} commandMessage
-     */
-    printEvaluationResult: function(result, wasThrown, promptText, commandMessage)
-    {
-        this.prompt.pushHistoryItem(promptText);
-        WebInspector.settings.consoleHistory.set(this.prompt.historyData.slice(-30));
-        this._printResult(result, wasThrown, /** @type {!WebInspector.ConsoleCommand} */ (this._messageToViewMessage.get(commandMessage)));
-    },
-
-    /**
      * @return {!Array.<!Element>}
      */
     elementsToRestoreScrollPositionsFor: function()
     {
         return [this.messagesElement];
     },
 
     searchCanceled: function()
     {
         this._clearCurrentSearchResultHighlight();
@@ skipping 369 matching lines @@
         var node = this.messagesElement.firstChild;
         while (node) {
             if (node.classList.contains("console-message") && node.message)
                 node.message.wasShown();
             if (node.classList.contains("console-group") && node.group)
                 node.group.wasShown();
             node = node.nextSibling;
         }
     }
 }