DevTools: render markers as circles on the main timeline.

third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js

 /*
  * Copyright (C) 2014 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 621 matching lines @@
         return this._entryTypeByLevel[this._timelineData.entryLevels[entryIndex]];
     },
 
     /**
      * @override
      * @param {number} entryIndex
      * @return {?Array.<!{title: string, value: (string|!Element)}>}
      */
     prepareHighlightedEntryInfo: function(entryIndex)
     {
-        var time;
+        var time = "";
         var title;
         var warning;
         var type = this._entryType(entryIndex);
         if (type === WebInspector.TimelineFlameChartEntryType.Event) {
             var event = /** @type {!WebInspector.TracingModel.Event} */ (this._entryData[entryIndex]);
             var totalTime = event.duration;
             var selfTime = event.selfTime;
             var /** @const */ eps = 1e-6;
-            time = typeof totalTime === "number" && Math.abs(totalTime - selfTime) > eps && selfTime > eps ?
-                WebInspector.UIString("%s (self %s)", Number.millisToString(totalTime, true), Number.millisToString(selfTime, true)) :
-                Number.millisToString(totalTime, true);
+            if (typeof totalTime === "number") {
+                time = Math.abs(totalTime - selfTime) > eps && selfTime > eps ?
+                    WebInspector.UIString("%s (self %s)", Number.millisToString(totalTime, true), Number.millisToString(selfTime, true)) :
+                    Number.millisToString(totalTime, true);
+            }
             title = this.entryTitle(entryIndex);
             warning = WebInspector.TimelineUIUtils.eventWarning(event);
         } else if (type === WebInspector.TimelineFlameChartEntryType.Frame) {
             var frame = /** @type {!WebInspector.TimelineFrame} */ (this._entryData[entryIndex]);
             time = WebInspector.UIString("%s ~ %.0f\u2009fps", Number.preciseMillisToString(frame.duration, 1), (1000 / frame.duration));
             title = frame.idle ? WebInspector.UIString("Idle Frame") : WebInspector.UIString("Frame");
             if (frame.hasWarnings()) {
                 warning = createElement("span");
                 warning.textContent = WebInspector.UIString("Long frame");
             }
@@ skipping 155 matching lines @@
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      * @param {number} level
      */
     _appendEvent: function(event, level)
     {
         var index = this._entryData.length;
         this._entryData.push(event);
         this._timelineData.entryLevels[index] = level;
-        this._timelineData.entryTotalTimes[index] = event.duration || WebInspector.TimelineFlameChartDataProvider.InstantEventVisibleDurationMs;
+        var duration;
+        if (WebInspector.TimelineModel.isMarkerEvent(event))
+            duration = undefined;
+        else
+            duration = event.duration || WebInspector.TimelineFlameChartDataProvider.InstantEventVisibleDurationMs;
+        this._timelineData.entryTotalTimes[index] = duration;
         this._timelineData.entryStartTimes[index] = event.startTime;
     },
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      * @param {number} level
      */
     _appendFlowEvent: function(event, level)
     {
         var timelineData = this._timelineData;
@@ skipping 669 matching lines @@
 /**
   * @constructor
   * @param {!WebInspector.TimelineSelection} selection
   * @param {number} entryIndex
   */
 WebInspector.TimelineFlameChartView.Selection = function(selection, entryIndex)
 {
     this.timelineSelection = selection;
     this.entryIndex = entryIndex;
 }