DevTools: update console timestamp style

third_party/WebKit/Source/devtools/front_end/console/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 127 matching lines @@
     this._prompt.element.addEventListener('keydown', this._promptKeyDown.bind(this), true);
 
     this._consoleHistoryAutocompleteSetting = Common.moduleSetting('consoleHistoryAutocomplete');
     this._consoleHistoryAutocompleteSetting.addChangeListener(this._consoleHistoryAutocompleteChanged, this);
 
     var historyData = this._consoleHistorySetting.get();
     this._prompt.history().setHistoryData(historyData);
     this._consoleHistoryAutocompleteChanged();
 
     this._updateFilterStatus();
-    Common.moduleSetting('consoleTimestampsEnabled').addChangeListener(this._consoleTimestampsSettingChanged, this);
+    Common.moduleSetting('consoleTimestampFormat').addChangeListener(this._consoleTimestampsSettingChanged, this);
 
     this._registerWithMessageSink();
     SDK.targetManager.observeTargets(this);
 
     this._initConsoleMessages();
 
     UI.context.addFlavorChangeListener(SDK.ExecutionContext, this._executionContextChanged, this);
 
     this._messagesElement.addEventListener('mousedown', this._updateStickToBottomOnMouseDown.bind(this), false);
     this._messagesElement.addEventListener('mouseup', this._updateStickToBottomOnMouseUp.bind(this), false);
@@ skipping 157 matching lines @@
     var consoleMessage = new SDK.ConsoleMessage(
         null, SDK.ConsoleMessage.MessageSource.Other, level, message.text, undefined, undefined, undefined, undefined,
         undefined, undefined, undefined, message.timestamp);
     this._addConsoleMessage(consoleMessage);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _consoleTimestampsSettingChanged(event) {
-    var enabled = /** @type {boolean} */ (event.data);
+    var enabled = /** @type {!Console.ConsoleViewMessage.TimestampFormat} */ (event.data);
     this._updateMessageList();
     this._consoleMessages.forEach(function(viewMessage) {
       viewMessage.updateTimestamp(enabled);
     });
   }
 
   _executionContextChanged() {
     this._prompt.clearAutocomplete();
     if (!this._showAllMessagesCheckbox.checked())
       this._updateMessageList();
@@ skipping 337 matching lines @@
       progressIndicator.setWorked(messageIndex);
     }
   }
 
   /**
    * @param {!Console.ConsoleViewMessage} lastMessage
    * @param {?Console.ConsoleViewMessage=} viewMessage
    * @return {boolean}
    */
   _tryToCollapseMessages(lastMessage, viewMessage) {
-    if (!Common.moduleSetting('consoleTimestampsEnabled').get() && viewMessage &&
-        !lastMessage.consoleMessage().isGroupMessage() &&
+    var timestampFormat = Common.moduleSetting('consoleTimestampFormat').get();
+    var timestampsShown = timestampFormat !== Console.ConsoleViewMessage.TimestampFormat.None;
+    if (!timestampsShown && viewMessage && !lastMessage.consoleMessage().isGroupMessage() &&
         lastMessage.consoleMessage().isEqual(viewMessage.consoleMessage())) {
       viewMessage.incrementRepeatCount();
       return true;
     }
 
     return false;
   }
 
   _updateMessageList() {
     this._topGroup = Console.ConsoleGroup.createTopGroup();
@@ skipping 517 matching lines @@
       this._formattedCommand = createElementWithClass('span', 'source-code');
       this._formattedCommand.textContent = this.text.replaceControlCharacters();
       this._contentElement.appendChild(this._formattedCommand);
 
       if (this._formattedCommand.textContent.length < Console.ConsoleCommand.MaxLengthToIgnoreHighlighter) {
         var javascriptSyntaxHighlighter = new UI.DOMSyntaxHighlighter('text/javascript', true);
         javascriptSyntaxHighlighter.syntaxHighlightNode(this._formattedCommand).then(this._updateSearch.bind(this));
       } else {
         this._updateSearch();
       }
+
+      this.updateTimestamp(Common.moduleSetting('consoleTimestampFormat').get());
     }
     return this._contentElement;
   }
 
   _updateSearch() {
     this.setSearchRegex(this.searchRegex());
   }
 };
 
 /**
@@ skipping 20 matching lines @@
    * @override
    * @return {!Element}
    */
   contentElement() {
     var element = super.contentElement();
     element.classList.add('console-user-command-result');
     if (this.consoleMessage().level === SDK.ConsoleMessage.MessageLevel.Log) {
       var icon = UI.Icon.create('smallicon-command-result', 'command-result-icon');
       element.insertBefore(icon, element.firstChild);
     }
-    this.updateTimestamp(false);
     return element;
   }
 };
 
 /**
  * @unrestricted
  */
 Console.ConsoleGroup = class {
   /**
    * @param {?Console.ConsoleGroup} parentGroup
@@ skipping 60 matching lines @@
         return true;
     }
     return false;
   }
 };
 
 /**
  * @typedef {{messageIndex: number, matchIndex: number}}
  */
 Console.ConsoleView.RegexMatchRange;