Introduce TracingTimelineModel

Source/devtools/front_end/timeline/TimelinePanel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel 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.
@@ skipping 28 matching lines @@
 importScript("TimelinePresentationModel.js");
 importScript("TimelineFrameModel.js");
 importScript("TimelineEventOverview.js");
 importScript("TimelineFrameOverview.js");
 importScript("TimelineMemoryOverview.js");
 importScript("TimelinePowerGraph.js");
 importScript("TimelinePowerOverview.js");
 importScript("TimelineFlameChart.js");
 importScript("TimelineUIUtils.js");
 importScript("TimelineView.js");
-importScript("TimelineTraceEventBindings.js");
 importScript("TimelineTracingView.js");
 importScript("TimelineLayersView.js");
 importScript("TracingModel.js");
+importScript("TracingTimelineModel.js");
 importScript("TransformController.js");
 
 /**
  * @constructor
  * @extends {WebInspector.Panel}
  * @implements {WebInspector.TimelineModeViewDelegate}
  * @implements {WebInspector.Searchable}
  */
 WebInspector.TimelinePanel = function()
 {
@@ skipping 194 matching lines @@
     },
 
     /**
      * @return {!WebInspector.TracingModel}
      */
     _tracingModel: function()
     {
         if (!this._lazyTracingModel) {
             this._lazyTracingModel = new WebInspector.TracingModel(WebInspector.targetManager.activeTarget());
             this._lazyTracingModel.addEventListener(WebInspector.TracingModel.Events.BufferUsage, this._onTracingBufferUsage, this);
+            this._tracingTimelineModel = new WebInspector.TracingTimelineModel(this._lazyTracingModel);
         }
         return this._lazyTracingModel;
     },
 
     /**
-     * @return {!WebInspector.TimelineTraceEventBindings}
-     */
-    _traceEventBindings: function()
-    {
-        if (!this._lazyTraceEventBindings) {
-            this._lazyTraceEventBindings = new WebInspector.TimelineTraceEventBindings();
-            if (this._lazyTracingModel)
-                this._lazyTraceEventBindings.setEvents(this._lazyTracingModel.inspectedTargetEvents());
-        }
-        return this._lazyTraceEventBindings;
-    },
-
-    /**
      * @return {!WebInspector.TimelineView}
      */
     _timelineView: function()
     {
         if (!this._lazyTimelineView)
             this._lazyTimelineView = new WebInspector.TimelineView(this, this._model);
         return this._lazyTimelineView;
     },
 
     /**
@@ skipping 327 matching lines @@
 
         var isFrameMode = this._overviewModeSetting.get() === WebInspector.TimelinePanel.OverviewMode.Frames;
         this._removeAllModeViews();
         this._overviewControls = [];
 
         if (isFrameMode)
             this._overviewControls.push(new WebInspector.TimelineFrameOverview(this._model, this._frameModel()));
         else
             this._overviewControls.push(new WebInspector.TimelineEventOverview(this._model));
 
-        var tracingModel = null;
-        var traceEventBindings = null;
+        var tracingTimelineModel = null;
         if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
-            tracingModel = this._tracingModel();
-            traceEventBindings = this._traceEventBindings();
+            this._tracingModel();
+            tracingTimelineModel = this._tracingTimelineModel;
         }
         if (WebInspector.experimentsSettings.timelineFlameChart.isEnabled() && this._flameChartEnabledSetting.get())
-            this._addModeView(new WebInspector.TimelineFlameChart(this, this._model, tracingModel, traceEventBindings, this._frameModel()));
+            this._addModeView(new WebInspector.TimelineFlameChart(this, this._model, tracingTimelineModel, this._frameModel()));
         else
             this._addModeView(this._timelineView());
 
         if (this._captureMemorySetting.get()) {
             if (!isFrameMode)  // Frame mode skews time, don't render aux overviews.
                 this._overviewControls.push(new WebInspector.TimelineMemoryOverview(this._model));
             this._addModeView(new WebInspector.MemoryCountersGraph(this, this._model));
         }
 
         if (this._capturePowerSetting && this._capturePowerSetting.get()) {
@@ skipping 48 matching lines @@
             this._overviewControls[i].timelineStopped();
     },
 
     _onTracingComplete: function()
     {
         if (this._lazyFrameModel) {
             this._lazyFrameModel.reset();
             this._lazyFrameModel.addTraceEvents(this._lazyTracingModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
             this._overviewPane.update();
         }
-        if (this._lazyTraceEventBindings) {
-            this._lazyTraceEventBindings.setEvents(this._lazyTracingModel.inspectedTargetEvents());
-            this._model.didStopRecordingTraceEvents(this._lazyTraceEventBindings.mainThreadEvents());
+        if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
+            this._tracingTimelineModel.didStopRecordingTraceEvents();
+            this._model.didStopRecordingTraceEvents(this._tracingTimelineModel.mainThreadEvents());
         }
         this._refreshViews();
     },
 
     _onProfilingStateChanged: function()
     {
         this._updateToggleTimelineButton(this.toggleTimelineButton.toggled);
     },
 
     /**
@@ skipping 267 matching lines @@
             return;
         }
         switch (this._selection.type()) {
         case WebInspector.TimelineSelection.Type.Record:
             var record = /** @type {!WebInspector.TimelineModel.Record} */ (this._selection.object());
             WebInspector.TimelineUIUtils.generatePopupContent(record, this._model, this._detailsLinkifier, this.showInDetails.bind(this, record.title()), this._model.loadedFromFile());
             break;
         case WebInspector.TimelineSelection.Type.TraceEvent:
             var event = /** @type {!WebInspector.TracingModel.Event} */ (this._selection.object());
             var title = WebInspector.TimelineUIUtils.styleForTimelineEvent(event.name).title;
-            var tracingModel = this._tracingModel();
-            var bindings = this._traceEventBindings();
-            WebInspector.TimelineUIUtils.buildTraceEventDetails(event, tracingModel, this._detailsLinkifier, this.showInDetails.bind(this, title), false, bindings, this._model.target());
+            var tracingModel = this._tracingTimelineModel;
+            WebInspector.TimelineUIUtils.buildTraceEventDetails(event, tracingModel, this._detailsLinkifier, this.showInDetails.bind(this, title), false, this._model.target());
             break;
         case WebInspector.TimelineSelection.Type.Frame:
             var frame = /** @type {!WebInspector.TimelineFrame} */ (this._selection.object());
             if (frame.layerTree) {
                 var layersView = this._layersView();
                 layersView.showLayerTree(frame.layerTree);
                 this._detailsView.setChildView(WebInspector.UIString("Frame Layers"), layersView);
             } else {
                 this.showInDetails(WebInspector.UIString("Frame Statistics"), WebInspector.TimelineUIUtils.generatePopupContentForFrame(this._lazyFrameModel, frame));
             }
@@ skipping 439 matching lines @@
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !this._hiddenRecords[record.type()];
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }