Timeline: decouple TimelineFrameModel from TimelineModel

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 232 matching lines @@
     {
         this._overviewPane.requestWindowTimes(windowStartTime, windowEndTime);
     },
 
     /**
      * @return {!WebInspector.TimelineFrameModel}
      */
     _frameModel: function()
     {
         if (!this._lazyFrameModel) {
-            this._lazyFrameModel = new WebInspector.TimelineFrameModel(this._model);
+            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());
-
         }
         return this._lazyFrameModel;
     },
 
     /**
      * @return {!WebInspector.TracingModel}
      */
     _tracingModel: function()
     {
         if (!this._lazyTracingModel) {
@@ skipping 398 matching lines @@
             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()) {
                 this._tracingModel().start(WebInspector.TimelinePanel.defaultTracingCategoryFilter, "");
                 this._tracingTimelineModel.willStartRecordingTraceEvents();
             }
         }
+        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;
@@ skipping 126 matching lines @@
     _hideProgressPane: function()
     {
         if (this._progressElement)
             this._progressElement.remove();
         delete this._progressElement;
     },
 
     _onRecordingStopped: function()
     {
         this._updateToggleTimelineButton(false);
+        if (this._lazyFrameModel && WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled()) {
+            this._lazyFrameModel.reset();
+            this._lazyFrameModel.addRecords(this._model.records());
+        }
         this._hideProgressPane();
     },
 
     _onRecordAdded: function(event)
     {
         this._addRecord(/** @type {!WebInspector.TimelineModel.Record} */(event.data));
     },
 
     /**
      * @param {!WebInspector.TimelineModel.Record} record
@@ skipping 609 matching lines @@
      * @param {!WebInspector.TimelineModel.Record} record
      * @return {boolean}
      */
     accept: function(record)
     {
         return !this._hiddenRecords[record.type()];
     },
 
     __proto__: WebInspector.TimelineModel.Filter.prototype
 }