Timeline: remove TimelineModel inferred properties from TracingModel.Event

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 696 matching lines @@
           /** @type {!WebInspector.TimelineIRModel.Phases} */ (this._entryData[entryIndex]));
       context.fillStyle = color;
       context.fillRect(barX, barY, barWidth - 1, 2);
       context.fillRect(barX, barY - 3, 2, 3);
       context.fillRect(barX + barWidth - 3, barY - 3, 2, 3);
       return false;
     }
 
     if (type === WebInspector.TimelineFlameChartEntryType.Event) {
       var event = /** @type {!WebInspector.TracingModel.Event} */ (this._entryData[entryIndex]);
-      if (event.hasCategory(WebInspector.TimelineModel.Category.LatencyInfo) && event.timeWaitingForMainThread) {
-        context.fillStyle = 'hsla(0, 70%, 60%, 1)';
-        var width = Math.floor(unclippedBarX - barX + event.timeWaitingForMainThread * timeToPixels);
-        context.fillRect(barX, barY + barHeight - 3, width, 2);
+      if (event.hasCategory(WebInspector.TimelineModel.Category.LatencyInfo)) {
+        var timeWaitingForMainThread = WebInspector.TimelineData.forEvent(event).timeWaitingForMainThread;
+        if (timeWaitingForMainThread) {
+          context.fillStyle = 'hsla(0, 70%, 60%, 1)';
+          var width = Math.floor(unclippedBarX - barX + timeWaitingForMainThread * timeToPixels);
+          context.fillRect(barX, barY + barHeight - 3, width, 2);
+        }
       }
-      if (event.warning)
+      if (WebInspector.TimelineData.forEvent(event).warning)
         paintWarningDecoration(barX, barWidth - 1.5);
     }
 
     /**
      * @param {number} x
      * @param {number} width
      */
     function paintWarningDecoration(x, width) {
       var /** @const */ triangleSize = 8;
       context.save();
@@ skipping 14 matching lines @@
 
   /**
    * @override
    * @param {number} entryIndex
    * @return {boolean}
    */
   forceDecoration(entryIndex) {
     var type = this._entryType(entryIndex);
     return type === WebInspector.TimelineFlameChartEntryType.Frame ||
         type === WebInspector.TimelineFlameChartEntryType.Event &&
-        !!(/** @type {!WebInspector.TracingModel.Event} */ (this._entryData[entryIndex]).warning);
+        !!WebInspector.TimelineData.forEvent(/** @type {!WebInspector.TracingModel.Event} */ (this._entryData[entryIndex])).warning;
   }
 
   /**
    * @param {string} title
    * @param {!WebInspector.FlameChart.GroupStyle} style
    * @param {boolean=} expanded
    */
   _appendHeader(title, style, expanded) {
     this._timelineData.groups.push({startLevel: this._currentLevel, name: title, expanded: expanded, style: style});
   }
@@ skipping 712 matching lines @@
 WebInspector.TimelineFlameChartView.Selection = class {
   /**
    * @param {!WebInspector.TimelineSelection} selection
    * @param {number} entryIndex
    */
   constructor(selection, entryIndex) {
     this.timelineSelection = selection;
     this.entryIndex = entryIndex;
   }
 };