DevTools: remove color generator from timeline flame chart.

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 24 matching lines @@
  * @param {!WebInspector.TimelineFrameModel} frameModel
  * @param {boolean} mainThread
  */
 WebInspector.TimelineFlameChartDataProvider = function(model, frameModel, mainThread)
 {
     WebInspector.FlameChartDataProvider.call(this);
     this._model = model;
     this._frameModel = frameModel;
     this._mainThread = mainThread;
     this._font = "bold 12px " + WebInspector.fontFamily();
-
-    this._colorGenerator = new WebInspector.FlameChart.ColorGenerator();
-    var categories = WebInspector.TimelineUIUtils.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 20;
     },
@@ skipping 22 matching lines @@
     {
         return this._font;
     },
 
     /**
      * @param {number} entryIndex
      * @return {?string}
      */
     entryTitle: function(entryIndex)
     {
-        return this._entryTitles[entryIndex];
+        return this._isSelfSegment[entryIndex] ? this._records[entryIndex].title() : null;
     },
 
     /**
      * @param {number} startTime
      * @param {number} endTime
      * @return {?Array.<number>}
      */
     dividerOffsets: function(startTime, endTime)
     {
         var frames = this._frameModel.filteredFrames(this._model.minimumRecordTime() + startTime, this._model.minimumRecordTime() + endTime);
@@ skipping 12 matching lines @@
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
      */
     addRecord: function(record)
     {
         this._appendRecord(record, 0);
     },
 
     /**
-     * @return {!WebInspector.FlameChart.ColorGenerator}
-     */
-    colorGenerator: function()
-    {
-        return this._colorGenerator;
-    },
-
-    /**
      * @return {!WebInspector.FlameChart.TimelineData}
      */
     timelineData: function()
     {
         if (!this._timelineData) {
             this._resetData();
             var records = this._model.records();
             for (var i = 0; i < records.length; ++i)
                 this._appendRecord(records[i], 0);
             this._zeroTime = this._model.minimumRecordTime();
@@ skipping 35 matching lines @@
 
         /**
          * @type {?WebInspector.FlameChart.TimelineData}
          */
         this._timelineData = {
             entryLevels: [],
             entryTotalTimes: [],
             entryOffsets: [],
         };
 
-        /** @type {!Array.<string>} */
-        this._entryTitles =  [];
-
-        /** @type {!Array.<string>} */
-        this._entryColors = [];
+        this._records = [];
+        this._isSelfSegment = [];
     },
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
      * @param {number} level
      */
     _appendRecord: function(record, level)
     {
         var timelineData = this.timelineData();
 
         this._startTime = this._startTime ? Math.min(this._startTime, record.startTime) : record.startTime;
         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 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);
+                this._pushRecord(record, true, level, currentTime, childStartTime);
             var childEndTime = childRecord.endTime || childRecord.startTime;
-            this._pushRecord(record, level, colorChild, childStartTime, childEndTime);
+            this._pushRecord(record, false, level, childStartTime, childEndTime);
             this._appendRecord(childRecord, level + 1);
             currentTime = childEndTime;
         }
         if (recordEndTime !== currentTime || record.children.length === 0)
-            this._pushRecord(record, level, color, currentTime, recordEndTime);
+            this._pushRecord(record, true, level, currentTime, recordEndTime);
 
         this._maxStackDepth = Math.max(this._maxStackDepth, level + 2);
     },
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
+     * @param {boolean} isSelfSegment
      * @param {number} level
-     * @param {string} color
      * @param {number} startTime
      * @param {number} endTime
      */
-    _pushRecord: function(record, level, color, startTime, endTime)
+    _pushRecord: function(record, isSelfSegment, level, startTime, endTime)
     {
-        var index = this._entryTitles.length;
-        this._entryTitles[index] = record.type;
+        var index = this._records.length;
+        this._records.push(record);
         this._timelineData.entryOffsets[index] = startTime - this._zeroTime;
         this._timelineData.entryLevels[index] = level;
         this._timelineData.entryTotalTimes[index] = endTime - startTime;
-        this._entryColors[index] = color;
+        this._isSelfSegment[index] = isSelfSegment;
     },
 
     /**
      * @param {number} entryIndex
      * @return {?Array.<!{title: string, text: string}>}
      */
     prepareHighlightedEntryInfo: function(entryIndex)
     {
         return null;
     },
@@ skipping 15 matching lines @@
     {
         return null;
     },
 
     /**
      * @param {number} entryIndex
      * @return {!string}
      */
     entryColor: function(entryIndex)
     {
-        return this._entryColors[entryIndex];
+        var category = WebInspector.TimelineUIUtils.categoryForRecord(this._records[entryIndex]);
+        return this._isSelfSegment[entryIndex] ? category.fillColorStop1 : category.backgroundColor;
     },
 
     /**
      * @param {number} entryIndex
      * @return {!string}
      */
     textColor: function(entryIndex)
     {
         return "white";
     }
@@ skipping 106 matching lines @@
 
     /**
      * @param {?WebInspector.TimelineModel.Record} record
      */
     setSelectedRecord: function(record)
     {
     },
 
     __proto__: WebInspector.View.prototype
 }