DevTools: merge TracingTimelineModel into TimelineModel

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @implements {WebInspector.FlameChartDataProvider}
- * @param {!WebInspector.TracingTimelineModel} model
+ * @param {!WebInspector.TimelineModel} model
  * @param {!WebInspector.TimelineFrameModelBase} frameModel
  */
 WebInspector.TimelineFlameChartDataProvider = function(model, frameModel)
 {
     WebInspector.FlameChartDataProvider.call(this);
     this.reset();
     this._model = model;
     this._frameModel = frameModel;
     this._font = "12px " + WebInspector.fontFamily();
     this._linkifier = new WebInspector.Linkifier();
     this._filters = [];
     this.addFilter(WebInspector.TimelineUIUtils.hiddenEventsFilter());
-    this.addFilter(new WebInspector.TracingTimelineModel.ExclusiveEventNameFilter([WebInspector.TracingTimelineModel.RecordType.Program]));
+    this.addFilter(new WebInspector.ExclusiveTraceEventNameFilter([WebInspector.TimelineModel.RecordType.Program]));
 }
 
 WebInspector.TimelineFlameChartDataProvider.InstantEventVisibleDurationMs = 0.01;
 WebInspector.TimelineFlameChartDataProvider.JSFrameCoalesceThresholdMs = 1.1;
 
 /**
  * @return {!WebInspector.FlameChart.ColorGenerator}
  */
 WebInspector.TimelineFlameChartDataProvider.consoleEventsColorGenerator = function()
 {
@@ skipping 47 matching lines @@
     entryTitle: function(entryIndex)
     {
         var event = this._entryEvents[entryIndex];
         if (event) {
             if (event.phase === WebInspector.TracingModel.Phase.AsyncStepInto || event.phase === WebInspector.TracingModel.Phase.AsyncStepPast)
                 return event.name + ":" + event.args["step"];
 
             var name = WebInspector.TimelineUIUtils.eventStyle(event).title;
             // TODO(yurys): support event dividers
             var details = WebInspector.TimelineUIUtils.buildDetailsNodeForTraceEvent(event, this._linkifier);
-            if (event.name === WebInspector.TracingTimelineModel.RecordType.JSFrame && details)
+            if (event.name === WebInspector.TimelineModel.RecordType.JSFrame && details)
                 return details.textContent;
             return details ? WebInspector.UIString("%s (%s)", name, details.textContent) : name;
         }
         var title = this._entryIndexToTitle[entryIndex];
         if (!title) {
             title = WebInspector.UIString("Unexpected entryIndex %d", entryIndex);
             console.error(title);
         }
         return title;
     },
@@ skipping 164 matching lines @@
      * @param {!Array.<!WebInspector.TimelineFrame>} frames
      */
     _appendFrameBars: function(frames)
     {
         this._frameBarsLevel = this._currentLevel++;
         for (var i = 0; i < frames.length; ++i)
             this._appendFrame(frames[i]);
     },
 
     /**
-     * @param {!WebInspector.TracingTimelineModel.Filter} filter
+     * @param {!WebInspector.TraceEventFilter} filter
      */
     addFilter: function(filter)
     {
         this._filters.push(filter);
     },
 
     /**
      * @param {!WebInspector.TracingModel.Event} event
      * @return {boolean}
      */
@@ skipping 46 matching lines @@
 
     /**
      * @param {number} entryIndex
      * @return {string}
      */
     entryColor: function(entryIndex)
     {
         var event = this._entryEvents[entryIndex];
         if (!event)
             return this._entryIndexToFrame[entryIndex] ? "white" : "#555";
-        if (event.name === WebInspector.TracingTimelineModel.RecordType.JSFrame)
+        if (event.name === WebInspector.TimelineModel.RecordType.JSFrame)
             return this._timelineData.entryLevels[entryIndex] % 2 ? "#efb320" : "#fcc02d";
         var category = WebInspector.TimelineUIUtils.eventStyle(event).category;
         if (WebInspector.TracingModel.isAsyncPhase(event.phase)) {
             if (event.category === WebInspector.TracingModel.ConsoleEventCategory)
                 return WebInspector.TimelineFlameChartDataProvider.consoleEventsColorGenerator().colorForID(event.name);
             var color = this._asyncColorByCategory[category.name];
             if (color)
                 return color;
             var parsedColor = WebInspector.Color.parse(category.fillColorStop1);
             color = parsedColor.setAlpha(0.7).toString(WebInspector.Color.Format.RGBA) || "";
@@ skipping 264 matching lines @@
         return -1;
     }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @implements {WebInspector.TimelineModeView}
  * @implements {WebInspector.FlameChartDelegate}
  * @param {!WebInspector.TimelineModeViewDelegate} delegate
- * @param {!WebInspector.TracingTimelineModel} tracingModel
+ * @param {!WebInspector.TimelineModel} tracingModel
  * @param {!WebInspector.TimelineFrameModelBase} frameModel
  */
 WebInspector.TimelineFlameChart = function(delegate, tracingModel, frameModel)
 {
     WebInspector.VBox.call(this);
     this.element.classList.add("timeline-flamechart");
     this._delegate = delegate;
     this._model = tracingModel;
     this._dataProvider = new WebInspector.TimelineFlameChartDataProvider(tracingModel, frameModel)
     this._mainView = new WebInspector.FlameChart(this._dataProvider, this, true);
@@ skipping 125 matching lines @@
 /**
   * @constructor
   * @param {!WebInspector.TimelineSelection} selection
   * @param {number} entryIndex
   */
 WebInspector.TimelineFlameChart.Selection = function(selection, entryIndex)
 {
     this.timelineSelection = selection;
     this.entryIndex = entryIndex;
 }