Move trace event based implementation parts of TimelineModel 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 55 matching lines @@
     this.registerRequiredCSS("timelinePanel.css");
     this.registerRequiredCSS("layersPanel.css");
     this.registerRequiredCSS("filter.css");
     this.element.addEventListener("contextmenu", this._contextMenu.bind(this), false);
 
     this._detailsLinkifier = new WebInspector.Linkifier();
     this._windowStartTime = 0;
     this._windowEndTime = Infinity;
 
     // Create model.
-    this._model = new WebInspector.TimelineModelImpl(WebInspector.timelineManager);
+    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);
+
+        this._model = this._tracingTimelineModel;
+    } else {
+        this._model = new WebInspector.TimelineModelImpl(WebInspector.timelineManager);
+    }
+
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, this._onRecordingStarted, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStopped, this._onRecordingStopped, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordsCleared, this._onRecordsCleared, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordingProgress, this._onRecordingProgress, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordFilterChanged, this._refreshViews, this);
     this._model.addEventListener(WebInspector.TimelineModel.Events.RecordAdded, this._onRecordAdded, this);
 
     this._model.target().profilingLock.addEventListener(WebInspector.Lock.Events.StateChanged, this._onProfilingStateChanged, this);
 
     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 80 matching lines @@
         this._detailsView.setVertical(vertically);
     },
 
     /**
      * @return {number}
      */
     windowStartTime: function()
     {
         if (this._windowStartTime)
             return this._windowStartTime;
-        if (this._model.minimumRecordTime() != -1)
-            return this._model.minimumRecordTime();
+        var minimumRecordTime = this._model.minimumRecordTime();
+        if (minimumRecordTime && minimumRecordTime != -1)

[caseq, 2014/06/09 11:59:03]

!==?

[yurys, 2014/06/09 12:16:13]

Done.

+            return minimumRecordTime;
         return 0;
     },
 
     /**
      * @return {number}
      */
     windowEndTime: function()
     {
         if (this._windowEndTime < Infinity)
             return this._windowEndTime;
-        if (this._model.maximumRecordTime() != -1)
-            return this._model.maximumRecordTime();
+        var maximumRecordTime = this._model.maximumRecordTime();
+        if (maximumRecordTime && maximumRecordTime != -1)

[caseq, 2014/06/09 11:59:03]

ditto

[yurys, 2014/06/09 12:16:13]

Done.

+            return maximumRecordTime;
         return Infinity;
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _sidebarResized: function(event)
     {
         var width = /** @type {number} */ (event.data);
         this._topPane.setSidebarSize(width);
@@ skipping 415 matching lines @@
 
         this._stackView.show(this._searchableView.element);
     },
 
     /**
      * @param {boolean} userInitiated
      */
     _startRecording: function(userInitiated)
     {
         this._userInitiatedRecording = userInitiated;
-        if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled()) {
-            this._model.willStartRecordingTraceEvents();
-            this._tracingTimelineModel.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get());
-        } else {
-            this._model.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get());
-            if (this._captureTracingSetting && this._captureTracingSetting.get())
-                this._tracingTimelineModel.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get());
-        }
+        this._model.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._tracingTimelineModel)
-            this._tracingTimelineModel.stopRecording()
 
         for (var i = 0; i < this._overviewControls.length; ++i)
             this._overviewControls[i].timelineStopped();
     },
 
     _onTracingComplete: function()
     {
-        if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled())
-            this._model.didStopRecordingTraceEvents(this._tracingTimelineModel.mainThreadEvents());
         if (this._lazyFrameModel) {
             this._lazyFrameModel.reset();
             this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._tracingModel.sessionId());
             this._overviewPane.update();
         }
         this._refreshViews();
     },
 
     _onProfilingStateChanged: function()
     {
@@ skipping 736 matching lines @@
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !this._hiddenRecords[record.type()];
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }