TimelineFlameChart: draw parent bar with different color if there is a child on top of it.

Source/devtools/front_end/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 27 matching lines @@
 WebInspector.TimelineFlameChartDataProvider = function(model, frameModel, mainThread)
 {
     WebInspector.FlameChartDataProvider.call(this);
     this._model = model;
     this._frameModel = frameModel;
     this._mainThread = mainThread;
     this._font = (this.barHeight() - 4) + "px " + WebInspector.fontFamily();
 
     this._colorGenerator = new WebInspector.FlameChart.ColorGenerator();
     var categories = WebInspector.TimelineUIUtils.categories();
-    for (var category in categories)
+    for (var category in categories) {
         this._colorGenerator.setColorForID(category, categories[category].fillColorStop1);
+        this._colorGenerator.setColorForID(category + " child", categories[category].fillColorStop0);
+    }
 }
 
 WebInspector.TimelineFlameChartDataProvider.prototype = {
     /**
      * @return {number}
      */
     barHeight: function()
     {
         return 15;
     },
@@ skipping 35 matching lines @@
     reset: function()
     {
         this._timelineData = null;
     },
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
      */
     addRecord: function(record)
     {
-        WebInspector.TimelineModel.forAllRecords([record], this._appendRecord.bind(this));
+        this._appendRecord(record, 0);
     },
 
     /**
      * @return {!WebInspector.FlameChart.ColorGenerator}
      */
     colorGenerator: function()
     {
         return this._colorGenerator;
     },
 
     /**
      * @return {!WebInspector.FlameChart.TimelineData}
      */
     timelineData: function()
     {
         if (!this._timelineData) {
             this._resetData();
-            this._model.forAllRecords(this._appendRecord.bind(this));
+            var records = this._model.records();
+            for (var i = 0; i < records.length; ++i)
+                this._appendRecord(records[i], 0);
             this._zeroTime = this._model.minimumRecordTime();
         }
         return /** @type {!WebInspector.FlameChart.TimelineData} */(this._timelineData);
     },
 
     /**
      * @return {number}
      */
     zeroTime: function()
     {
@@ skipping 35 matching lines @@
 
         /** @type {!Array.<string>} */
         this._entryTitles =  [];
 
         /** @type {!Array.<string>} */
         this._entryColors = [];
     },
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
-     * @param {number} depth
+     * @param {number} level
      */
-    _appendRecord: function(record, depth)
+    _appendRecord: function(record, level)
     {
         var timelineData = this.timelineData();
 
         this._startTime = this._startTime ? Math.min(this._startTime, record.startTime) : record.startTime;
-        var startTime = this._startTime;
-        this._zeroTime = startTime;
-        var endTime = record.endTime || record.startTime - startTime;
-        this._endTime = Math.max(this._endTime, endTime);
+        this._zeroTime = this._startTime;
+        var recordEndTime = record.endTime || record.startTime;
+        this._endTime = Math.max(this._endTime, recordEndTime);
         this._totalTime = Math.max(1000, this._endTime - this._startTime);
 
         if (this._mainThread) {
             if (record.type === WebInspector.TimelineModel.RecordType.GPUTask || !!record.thread)
                 return;
         } else {
             if (record.type === WebInspector.TimelineModel.RecordType.Program || !record.thread)
                 return;
         }
 
-        var index = this._entryTitles.length;
-        this._entryTitles[index] = record.type;
-        timelineData.entryOffsets[index] = record.startTime - startTime;
-        timelineData.entryLevels[index] = depth;
-        timelineData.entryTotalTimes[index] = endTime - record.startTime;
-        this._entryColors[index] = this._colorGenerator.colorForID(WebInspector.TimelineUIUtils.categoryForRecord(record).name);
-        this._maxStackDepth = Math.max(this._maxStackDepth, depth + 1);
+        var color = this._colorGenerator.colorForID(WebInspector.TimelineUIUtils.categoryForRecord(record).name);
+        var colorChild = this._colorGenerator.colorForID(WebInspector.TimelineUIUtils.categoryForRecord(record).name + " child");
+
+        var currentTime = record.startTime;
+        for (var i = 0; i < record.children.length; ++i) {
+            var childRecord = record.children[i];
+            var childStartTime = childRecord.startTime;
+            if (currentTime !== childStartTime)
+                this._pushRecord(record, level, color, currentTime, childStartTime);
+            var childEndTime = childRecord.endTime || childRecord.startTime;
+            this._pushRecord(record, level, colorChild, childStartTime, childEndTime);
+            this._appendRecord(childRecord, level + 1);
+            currentTime = childEndTime;
+        }
+        if (recordEndTime !== currentTime || record.children.length === 0)
+            this._pushRecord(record, level, color, currentTime, recordEndTime);
+
+        this._maxStackDepth = Math.max(this._maxStackDepth, level + 2);
     },
 
     /**
+     * @param {!WebInspector.TimelineModel.Record} record
+     * @param {number} level
+     * @param {string} color
+     * @param {number} startTime
+     * @param {number} endTime
+     */
+    _pushRecord: function(record, level, color, startTime, endTime)
+    {
+        var index = this._entryTitles.length;
+        this._entryTitles[index] = record.type;
+        this._timelineData.entryOffsets[index] = startTime - this._zeroTime;
+        this._timelineData.entryLevels[index] = level;
+        this._timelineData.entryTotalTimes[index] = endTime - startTime;
+        this._entryColors[index] = color;
+    },
+
+    /**
      * @param {number} entryIndex
      * @return {?Array.<!{title: string, text: string}>}
      */
     prepareHighlightedEntryInfo: function(entryIndex)
     {
         return null;
     },
 
     /**
      * @param {number} entryIndex
@@ skipping 130 matching lines @@
 
     /**
      * @param {?WebInspector.TimelineModel.Record} record
      */
     setSelectedRecord: function(record)
     {
     },
 
     __proto__: WebInspector.View.prototype
 }