| Index: Source/devtools/front_end/timeline/TimelinePanel.js
|
| diff --git a/Source/devtools/front_end/timeline/TimelinePanel.js b/Source/devtools/front_end/timeline/TimelinePanel.js
|
| index 1965c8865cdfec4b56cf26552468b09352f747c1..0a1f974fccc523194fa6007b9ee7f5af91c094c7 100644
|
| --- a/Source/devtools/front_end/timeline/TimelinePanel.js
|
| +++ b/Source/devtools/front_end/timeline/TimelinePanel.js
|
| @@ -267,7 +267,7 @@ WebInspector.TimelinePanel.prototype = {
|
| this._lazyFrameModel = tracingFrameModel;
|
| } else {
|
| var frameModel = new WebInspector.TimelineFrameModel(this._model.target());
|
| - frameModel.setMergeRecords(!WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled() || !this._recordingInProgress);
|
| + frameModel.setMergeRecords(!this._recordingInProgress);
|
| frameModel.addRecords(this._model.records());
|
| this._lazyFrameModel = frameModel;
|
| }
|
| @@ -703,7 +703,7 @@ WebInspector.TimelinePanel.prototype = {
|
| {
|
| this._userInitiatedRecording = userInitiated;
|
| this._model.startRecording(this._captureStacksSetting.get(), this._captureMemorySetting.get(), this._captureLayersAndPicturesSetting && this._captureLayersAndPicturesSetting.get());
|
| - if (WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled() && this._lazyFrameModel)
|
| + if (this._lazyFrameModel)
|
| this._lazyFrameModel.setMergeRecords(false);
|
|
|
| for (var i = 0; i < this._overviewControls.length; ++i)
|
| @@ -798,8 +798,7 @@ WebInspector.TimelinePanel.prototype = {
|
| _onRecordingStarted: function()
|
| {
|
| this._updateToggleTimelineButton(true);
|
| - if (WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled())
|
| - this._updateProgress(WebInspector.UIString("%d events collected", 0));
|
| + this._updateProgress(WebInspector.UIString("%d events collected", 0));
|
| },
|
|
|
| _recordingInProgress: function()
|
| @@ -812,8 +811,6 @@ WebInspector.TimelinePanel.prototype = {
|
| */
|
| _onRecordingProgress: function(event)
|
| {
|
| - if (!WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled())
|
| - return;
|
| this._updateProgress(WebInspector.UIString("%d events collected", event.data));
|
| },
|
|
|
| @@ -854,12 +851,11 @@ WebInspector.TimelinePanel.prototype = {
|
| this._stopPending = false;
|
| this._updateToggleTimelineButton(false);
|
| if (this._lazyFrameModel) {
|
| + this._lazyFrameModel.reset();
|
| if (this._tracingTimelineModel) {
|
| - this._lazyFrameModel.reset();
|
| this._lazyFrameModel.addTraceEvents(this._tracingTimelineModel.inspectedTargetEvents(), this._tracingModel.sessionId());
|
| this._overviewPane.update();
|
| - } else if (WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled()) {
|
| - this._lazyFrameModel.reset();
|
| + } else {
|
| this._lazyFrameModel.addRecords(this._model.records());
|
| }
|
| }
|
|
|