Timeline: simplify handling of event category colors

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 589 matching lines @@
         if (type === WebInspector.TimelineFlameChartEntryType.Event) {
             var event = /** @type {!WebInspector.TracingModel.Event} */ (this._entryData[entryIndex]);
             if (!WebInspector.TracingModel.isAsyncPhase(event.phase))
                 return WebInspector.TimelineUIUtils.eventColor(event);
             if (event.hasCategory(WebInspector.TimelineModel.Category.Console) || event.hasCategory(WebInspector.TimelineModel.Category.UserTiming))
                 return this._consoleColorGenerator.colorForID(event.name);
             var category = WebInspector.TimelineUIUtils.eventStyle(event).category;
             var color = this._asyncColorByCategory[category.name];
             if (color)
                 return color;
-            var parsedColor = WebInspector.Color.parse(category.fillColorStop1);
+            var parsedColor = WebInspector.Color.parse(category.color);
             color = parsedColor.setAlpha(0.7).asString(WebInspector.Color.Format.RGBA) || "";
             this._asyncColorByCategory[category.name] = color;
             return color;
         }
         if (type === WebInspector.TimelineFlameChartEntryType.Frame)
             return "white";
         if (type === WebInspector.TimelineFlameChartEntryType.Header)
             return "#aaa";
         return "";
     },
@@ skipping 233 matching lines @@
 
 /**
  * @constructor
  * @extends {WebInspector.TimelineFlameChartDataProviderBase}
  * @param {!WebInspector.TimelineModel} model
  */
 WebInspector.TimelineFlameChartNetworkDataProvider = function(model)
 {
     WebInspector.TimelineFlameChartDataProviderBase.call(this, model);
     var loadingCategory = WebInspector.TimelineUIUtils.categories()["loading"];
-    this._waitingColor = loadingCategory.backgroundColor;
-    this._processingColor = loadingCategory.fillColorStop1;
+    this._waitingColor = loadingCategory.childColor;
+    this._processingColor = loadingCategory.color;
 }
 
 WebInspector.TimelineFlameChartNetworkDataProvider.prototype = {
     /**
      * @override
      * @return {!WebInspector.FlameChart.TimelineData}
      */
     timelineData: function()
     {
         if (this._timelineData)
@@ skipping 526 matching lines @@
 /**
   * @constructor
   * @param {!WebInspector.TimelineSelection} selection
   * @param {number} entryIndex
   */
 WebInspector.TimelineFlameChartView.Selection = function(selection, entryIndex)
 {
     this.timelineSelection = selection;
     this.entryIndex = entryIndex;
 }