Index: Source/devtools/front_end/timeline/TimelineModelImpl.js |
diff --git a/Source/devtools/front_end/timeline/TimelineModelImpl.js b/Source/devtools/front_end/timeline/TimelineModelImpl.js |
index d44ae4a323b915d1dfd2decc791b936adcf42599..36b03055f9ea8a783eee2c588e94549df07421e9 100644 |
--- a/Source/devtools/front_end/timeline/TimelineModelImpl.js |
+++ b/Source/devtools/front_end/timeline/TimelineModelImpl.js |
@@ -49,13 +49,13 @@ WebInspector.TimelineModelImpl.prototype = { |
WebInspector.TimelineModel.RecordType.DrawFrame, |
WebInspector.TimelineModel.RecordType.RequestMainThreadFrame, |
WebInspector.TimelineModel.RecordType.ActivateLayerTree ]; |
- this._timelineManager.start(maxStackFrames, WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled(), liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this)); |
+ this._timelineManager.start(maxStackFrames, liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this)); |
}, |
stopRecording: function() |
{ |
if (!this._clientInitiatedRecording) { |
- this._timelineManager.start(undefined, undefined, undefined, undefined, undefined, stopTimeline.bind(this)); |
+ this._timelineManager.start(undefined, undefined, undefined, undefined, stopTimeline.bind(this)); |
return; |
} |
@@ -86,8 +86,7 @@ WebInspector.TimelineModelImpl.prototype = { |
*/ |
_onRecordAdded: function(event) |
{ |
- if (this._collectionEnabled) |
yurys
2014/07/17 10:42:24
Without this check we will display events if timel
|
- this._addRecord(/** @type {!TimelineAgent.TimelineEvent} */(event.data)); |
+ this._addRecord(/** @type {!TimelineAgent.TimelineEvent} */(event.data)); |
}, |
/** |
@@ -106,9 +105,8 @@ WebInspector.TimelineModelImpl.prototype = { |
*/ |
_onStopped: function(event) |
{ |
- // If we were buffering events, discard those that got through, the real ones are coming! |
- if (WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled()) |
- this.reset(); |
+ // We were buffering events, discard those that got through, the real ones are coming! |
+ this.reset(); |
if (event.data) { |
// Stopped from console. |
this._fireRecordingStopped(null, null); |
@@ -125,7 +123,6 @@ WebInspector.TimelineModelImpl.prototype = { |
_fireRecordingStarted: function() |
{ |
- this._collectionEnabled = true; |
this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStarted); |
}, |
@@ -135,7 +132,6 @@ WebInspector.TimelineModelImpl.prototype = { |
*/ |
_fireRecordingStopped: function(error, cpuProfile) |
{ |
- this._collectionEnabled = false; |
if (cpuProfile) |
WebInspector.TimelineJSProfileProcessor.mergeJSProfileIntoTimeline(this, cpuProfile); |
this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStopped); |