Move inspected target events calculation into 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 233 matching lines @@
     },
 
     /**
      * @return {!WebInspector.TimelineFrameModel}
      */
     _frameModel: function()
     {
         if (!this._lazyFrameModel) {
             this._lazyFrameModel = new WebInspector.TimelineFrameModel(this._model);
             if (this._lazyTracingModel)
-                this._lazyFrameModel.addTraceEvents(this._lazyTracingModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
+                this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
 
         }
         return this._lazyFrameModel;
     },
 
     /**
      * @return {!WebInspector.TracingModel}
      */
     _tracingModel: function()
     {
@@ skipping 391 matching lines @@
      */
     _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();
         } else {
             this._model.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get());
-            if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled())
+            if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled()) {
                 this._tracingModel().start(WebInspector.TimelinePanel.defaultTracingCategoryFilter, "");
+                this._tracingTimelineModel.willStartRecordingTraceEvents();
+            }
         }
         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));
 
         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._lazyTracingModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
+            this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._lazyTracingModel.sessionId());
             this._overviewPane.update();
         }
-        if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
-            this._tracingTimelineModel.didStopRecordingTraceEvents();
+        if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled())
             this._model.didStopRecordingTraceEvents(this._tracingTimelineModel.mainThreadEvents());
-        }
         this._refreshViews();
     },
 
     _onProfilingStateChanged: function()
     {
         this._updateToggleTimelineButton(this.toggleTimelineButton.toggled);
     },
 
     /**
      * @param {boolean} toggled
@@ skipping 727 matching lines @@
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !this._hiddenRecords[record.type()];
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }