DevTools: insert console message decorations in order

third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
index 27a37e27234b6931f0c184e51e30d49a1547400c..ea5032177f982e6431e3d4c9600dd58ca783b605 100644
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
@@ -107,7 +107,7 @@ Console.ConsoleView = class extends UI.VBox {
 
     this._viewportThrottler = new Common.Throttler(50);
 
-    this._filterStatusMessageElement = createElementWithClass('div', 'console-message');
+    this._filterStatusMessageElement = createElementWithClass('div', 'console-message-wrapper');
     this._messagesElement.insertBefore(this._filterStatusMessageElement, this._messagesElement.firstChild);
     this._filterStatusTextElement = this._filterStatusMessageElement.createChild('span', 'console-info');
     this._filterStatusMessageElement.createTextChild(' ');
@@ -150,7 +150,7 @@ Console.ConsoleView = class extends UI.VBox {
     this._consoleHistoryAutocompleteChanged();
 
     this._updateFilterStatus();
-    Common.moduleSetting('consoleTimestampFormat').addChangeListener(this._consoleTimestampsSettingChanged, this);
+    Common.moduleSetting('consoleTimestampFormat').addChangeListener(this._updateMessageList, this);
 
     this._registerWithMessageSink();
     SDK.targetManager.observeTargets(this);
@@ -320,11 +320,6 @@ Console.ConsoleView = class extends UI.VBox {
     this._addConsoleMessage(consoleMessage);
   }
 
-  _consoleTimestampsSettingChanged() {
-    this._updateMessageList();
-    this._consoleMessages.forEach(viewMessage => viewMessage.updateTimestamp());
-  }
-
   _executionContextChanged() {
     this._prompt.clearAutocomplete();
     if (this._filter._showTargetMessagesCheckbox.checked())
@@ -546,8 +541,6 @@ Console.ConsoleView = class extends UI.VBox {
     switch (message.type) {
       case SDK.ConsoleMessage.MessageType.Command:
         return new Console.ConsoleCommand(message, this._linkifier, nestingLevel);
-      case SDK.ConsoleMessage.MessageType.Result:
-        return new Console.ConsoleCommandResult(message, this._linkifier, nestingLevel);
       case SDK.ConsoleMessage.MessageType.StartGroupCollapsed:
       case SDK.ConsoleMessage.MessageType.StartGroup:
         return new Console.ConsoleGroupViewMessage(message, this._linkifier, nestingLevel);
@@ -1185,9 +1178,6 @@ Console.ConsoleCommand = class extends Console.ConsoleViewMessage {
   contentElement() {
     if (!this._contentElement) {
       this._contentElement = createElementWithClass('div', 'console-user-command');
-      var icon = UI.Icon.create('smallicon-user-command', 'command-result-icon');
-      this._contentElement.appendChild(icon);
-
       this._contentElement.message = this;
 
       this._formattedCommand = createElementWithClass('span', 'source-code');
@@ -1200,8 +1190,6 @@ Console.ConsoleCommand = class extends Console.ConsoleViewMessage {
       } else {
         this._updateSearch();
       }
-
-      this.updateTimestamp();
     }
     return this._contentElement;
   }
@@ -1221,36 +1209,6 @@ Console.ConsoleCommand.MaxLengthToIgnoreHighlighter = 10000;
 /**
  * @unrestricted
  */
-Console.ConsoleCommandResult = class extends Console.ConsoleViewMessage {
-  /**
-   * @param {!SDK.ConsoleMessage} message
-   * @param {!Components.Linkifier} linkifier
-   * @param {number} nestingLevel
-   */
-  constructor(message, linkifier, nestingLevel) {
-    super(message, linkifier, nestingLevel);
-  }
-
-  /**
-   * @override
-   * @return {!Element}
-   */
-  contentElement() {
-    var element = super.contentElement();
-    if (!element.classList.contains('console-user-command-result')) {
-      element.classList.add('console-user-command-result');
-      if (this.consoleMessage().level === SDK.ConsoleMessage.MessageLevel.Info) {
-        var icon = UI.Icon.create('smallicon-command-result', 'command-result-icon');
-        element.insertBefore(icon, element.firstChild);
-      }
-    }
-    return element;
-  }
-};
-
-/**
- * @unrestricted
- */
 Console.ConsoleGroup = class {
   /**
    * @param {?Console.ConsoleGroup} parentGroup