Create Tracing{Timeline}Model in TimelinePanel constructor

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 74 matching lines @@
 
     this._categoryFilter = new WebInspector.TimelineCategoryFilter();
     this._durationFilter = new WebInspector.TimelineIsLongFilter();
     this._textFilter = new WebInspector.TimelineTextFilter();
 
     this._model.addFilter(new WebInspector.TimelineHiddenFilter());
     this._model.addFilter(this._categoryFilter);
     this._model.addFilter(this._durationFilter);
     this._model.addFilter(this._textFilter);
 
+    if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled() ||
+        WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
+        this._tracingModel = new WebInspector.TracingModel(WebInspector.targetManager.activeTarget());
+        this._tracingModel.addEventListener(WebInspector.TracingModel.Events.BufferUsage, this._onTracingBufferUsage, this);
+
+        this._tracingTimelineModel = new WebInspector.TracingTimelineModel(this._tracingModel);
+        this._tracingTimelineModel.addEventListener(WebInspector.TracingTimelineModel.Events.TracingComplete, this._onTracingComplete, this);
+    }
+
     /** @type {!Array.<!WebInspector.TimelineModeView>} */
     this._currentViews = [];
 
     this._overviewModeSetting = WebInspector.settings.createSetting("timelineOverviewMode", WebInspector.TimelinePanel.OverviewMode.Events);
     this._flameChartEnabledSetting = WebInspector.settings.createSetting("timelineFlameChartEnabled", false);
     this._createStatusBarItems();
 
     this._topPane = new WebInspector.SplitView(true, false);
     this._topPane.element.id = "timeline-overview-panel";
     this._topPane.show(this.element);
@@ skipping 41 matching lines @@
     Events: "Events",
     Frames: "Frames"
 };
 
 // Define row and header height, should be in sync with styles for timeline graphs.
 WebInspector.TimelinePanel.rowHeight = 18;
 WebInspector.TimelinePanel.headerHeight = 20;
 
 WebInspector.TimelinePanel.durationFilterPresetsMs = [0, 1, 15];
 
-WebInspector.TimelinePanel.defaultTracingCategoryFilter = "*,disabled-by-default-cc.debug,disabled-by-default-devtools.timeline";
-
 WebInspector.TimelinePanel.prototype = {
     /**
      * @return {?WebInspector.SearchableView}
      */
     searchableView: function()
     {
         return this._searchableView;
     },
 
     wasShown: function()
@@ skipping 78 matching lines @@
 
     /**
      * @return {!WebInspector.TimelineFrameModel}
      */
     _frameModel: function()
     {
         if (!this._lazyFrameModel) {
             this._lazyFrameModel = new WebInspector.TimelineFrameModel(this._model.target());
             this._lazyFrameModel.setMergeRecords(!WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled() || !this._recordingInProgress);
             this._lazyFrameModel.addRecords(this._model.records());
-            if (this._lazyTracingModel)
-                this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
+            if (this._tracingModel)
+                this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._tracingModel.sessionId() || "");
         }
         return this._lazyFrameModel;
     },
 
     /**
-     * @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.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 tracingTimelineModel = null;
-        if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
-            this._tracingModel();
-            tracingTimelineModel = this._tracingTimelineModel;
+        if (WebInspector.experimentsSettings.timelineFlameChart.isEnabled() && this._flameChartEnabledSetting.get()) {
+            var tracingTimelineModel = WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled() ? this._tracingTimelineModel : null;
+            this._addModeView(new WebInspector.TimelineFlameChart(this, this._model, tracingTimelineModel, this._frameModel()));
+        } else {
+            this._addModeView(this._timelineView());
         }
-        if (WebInspector.experimentsSettings.timelineFlameChart.isEnabled() && this._flameChartEnabledSetting.get())
-            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()) {
             if (!isFrameMode)  // Frame mode skews time, don't render aux overviews.
                 this._overviewControls.push(new WebInspector.TimelinePowerOverview(this._model));
             this._addModeView(new WebInspector.TimelinePowerGraph(this, this._model));
         }
 
         if (this._captureTracingSetting && this._captureTracingSetting.get())
-            this._addModeView(new WebInspector.TimelineTracingView(this, this._tracingModel(), this._model));
+            this._addModeView(new WebInspector.TimelineTracingView(this, this._tracingModel, this._model));
 
         this._timelineView().setFrameModel(isFrameMode ? this._frameModel() : null);
         this._overviewPane.setOverviewControls(this._overviewControls);
         this.doResize();
         this._updateSelectedRangeStats();
 
         this._stackView.show(this._searchableView.element);
     },
 
     /**
      * @param {boolean} userInitiated
      */
     _startRecording: function(userInitiated)
     {
         this._userInitiatedRecording = userInitiated;
         if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
-            var categories = ["disabled-by-default-devtools.timeline", "devtools"];
-            if (this._captureStacksSetting.get())
-                categories.push("disabled-by-default-devtools.timeline.stack");
             this._model.willStartRecordingTraceEvents();
-            this._tracingModel().start(categories.join(","), "");
-            this._tracingTimelineModel.willStartRecordingTraceEvents();
+            this._tracingTimelineModel.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get());
         } else {
             this._model.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get());
-            if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled()) {
-                this._tracingModel().start(WebInspector.TimelinePanel.defaultTracingCategoryFilter, "");
-                this._tracingTimelineModel.willStartRecordingTraceEvents();
-            }
+            if (this._captureTracingSetting && this._captureTracingSetting.get())
+                this._tracingTimelineModel.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get());
         }
         if (WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled() && this._lazyFrameModel)
             this._lazyFrameModel.setMergeRecords(false);
 
         for (var i = 0; i < this._overviewControls.length; ++i)
             this._overviewControls[i].timelineStarted();
 
         if (userInitiated)
             WebInspector.userMetrics.TimelineStarted.record();
     },
 
     _stopRecording: function()
     {
         this._userInitiatedRecording = false;
         this._model.stopRecording();
-        if (this._lazyTracingModel)
-            this._lazyTracingModel.stop(this._onTracingComplete.bind(this));
+        if (this._tracingTimelineModel)
+            this._tracingTimelineModel.stopRecording()
 
         for (var i = 0; i < this._overviewControls.length; ++i)
             this._overviewControls[i].timelineStopped();
     },
 
     _onTracingComplete: function()
     {
-        this._tracingTimelineModel.didStopRecordingTraceEvents();
         if (this._lazyFrameModel) {
             this._lazyFrameModel.reset();
-            this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
+            this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._tracingModel.sessionId());
             this._overviewPane.update();
         }
         if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled())
             this._model.didStopRecordingTraceEvents(this._tracingTimelineModel.mainThreadEvents());
         this._refreshViews();
     },
 
     _onProfilingStateChanged: function()
     {
         this._updateToggleTimelineButton(this.toggleTimelineButton.toggled);
@@ skipping 735 matching lines @@
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !this._hiddenRecords[record.type()];
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }