FlameChart: convert colors magic into dataProvider.entryColor getter

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 146 matching lines @@
 
     _resetData: function()
     {
         this._startTime = 0;
         this._endTime = 0;
         this._maxStackDepth = 5;
         this._totalTime = 1000;
         this._zeroTime = 0;
 
         this._timelineData = {
-            entryLevels: [],
-            entryTotalTimes: [],
-            entryOffsets: [],
-            colorEntryIndexes: []
+            entryLevels: /** @type {!Array.<number>} */ ([]),

[pfeldman, 2014/03/03 12:20:54]

You should annotate _timelineData instead.

[loislo, 2014/03/03 14:29:26]

Done.

+            entryTotalTimes: /** @type {!Array.<number>} */ ([]),
+            entryOffsets: /** @type {!Array.<number>} */ ([]),
         };
-        this._entryTitles = [];
+
+        /** @type {!Array.<string>} */
+        this._entryTitles =  [];
+
+        /** @type {!Array.<string>} */
+        this._entryColors = [];
     },
 
     _appendRecord: function(record, depth)
     {
         var timelineData = this._timelineData;
 
         this._startTime = this._startTime ? Math.min(this._startTime, record.startTime) : record.startTime;
         var startTime = this._startTime;
         var endTime = record.endTime || record.startTime - startTime;
         this._endTime = Math.max(this._endTime, endTime);
         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 - 1;
         timelineData.entryTotalTimes[index] = endTime - record.startTime;
-
-        var color = this._colorGenerator.colorForID(WebInspector.TimelineUIUtils.categoryForRecord(record).name);
-        var indexesForColor = timelineData.colorEntryIndexes[color.index];
-        if (!indexesForColor)
-            indexesForColor = timelineData.colorEntryIndexes[color.index] = [];
-        indexesForColor.push(index);
-
+        this._entryColors[index] = this._colorGenerator.colorForID(WebInspector.TimelineUIUtils.categoryForRecord(record).name);
         this._maxStackDepth = Math.max(this._maxStackDepth, depth + 1);
     },
 
     /**
      * @param {number} entryIndex
      * @return {?Array.<!{title: string, text: string}>}
      */
     prepareHighlightedEntryInfo: function(entryIndex)
     {
         return null;
     },
 
     /**
      * @param {number} entryIndex
      * @return {boolean}
      */
     canJumpToEntry: function(entryIndex)
     {
         return false;
     },
 
     /**
      * @param {number} entryIndex
      * @return {?Object}
      */
     entryData: function(entryIndex)
     {
         return null;
+    },
+
+    /**
+     * @param {number} entryIndex
+     * @return {!string}
+     */
+    entryColor: function(entryIndex)
+    {
+        return this._entryColors[entryIndex];
     }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.View}
  * @implements {WebInspector.TimelineModeView}
  * @implements {WebInspector.TimeRangeController}
  * @param {!WebInspector.TimelineModeViewDelegate} delegate
  * @param {!WebInspector.TimelineModel} model
@@ skipping 93 matching lines @@
 
     /**
      * @param {?WebInspector.TimelinePresentationModel.Record} record
      */
     setSelectedRecord: function(record)
     {
     },
 
     __proto__: WebInspector.View.prototype
 }