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 ee6450fb8fd8a4b65eefa1a458e95fda7f186968..63bc91d530dac9a1f5356dc2607b0e141ed31678 100644 |
--- a/Source/devtools/front_end/timeline/TimelineModelImpl.js |
+++ b/Source/devtools/front_end/timeline/TimelineModelImpl.js |
@@ -60,7 +60,7 @@ WebInspector.TimelineModelImpl.prototype = { |
WebInspector.TimelineModel.RecordType.DrawFrame, |
WebInspector.TimelineModel.RecordType.RequestMainThreadFrame, |
WebInspector.TimelineModel.RecordType.ActivateLayerTree ]; |
- this._currentTarget.timelineManager.start(maxStackFrames, WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled(), liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this)); |
+ this._currentTarget.timelineManager.start(maxStackFrames, liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this)); |
}, |
stopRecording: function() |
@@ -69,7 +69,7 @@ WebInspector.TimelineModelImpl.prototype = { |
return; |
if (!this._clientInitiatedRecording) { |
- this._currentTarget.timelineManager.start(undefined, undefined, undefined, undefined, undefined, stopTimeline.bind(this)); |
+ this._currentTarget.timelineManager.start(undefined, undefined, undefined, undefined, stopTimeline.bind(this)); |
return; |
} |
@@ -101,7 +101,7 @@ WebInspector.TimelineModelImpl.prototype = { |
_onRecordAdded: function(event) |
{ |
var timelineManager = /** @type {!WebInspector.TimelineManager} */ (event.target); |
- if (this._collectionEnabled && timelineManager.target() === this._currentTarget) |
+ if (timelineManager.target() === this._currentTarget) |
this._addRecord(/** @type {!TimelineAgent.TimelineEvent} */(event.data)); |
}, |
@@ -110,7 +110,7 @@ WebInspector.TimelineModelImpl.prototype = { |
*/ |
_onStarted: function(event) |
{ |
- if (!event.data || this._collectionEnabled) |
yurys
2014/07/24 16:58:37
Revert this. You can reset this flag on RecordProc
loislo
2014/07/28 14:00:06
Done.
|
+ if (!event.data) |
return; |
// Started from console. |
var timelineManager = /** @type {!WebInspector.TimelineManager} */ (event.target); |
@@ -129,11 +129,9 @@ WebInspector.TimelineModelImpl.prototype = { |
var timelineManager = /** @type {!WebInspector.TimelineManager} */ (event.target); |
if (timelineManager.target() !== this._currentTarget) |
return; |
- // If we were buffering events, discard those that got through, the real ones are coming! |
- if (WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled()) { |
- this.reset(); |
- this._currentTarget = timelineManager.target(); |
- } |
+ // We were buffering events, discard those that got through, the real ones are coming! |
+ this.reset(); |
+ this._currentTarget = timelineManager.target(); |
if (event.data) { |
// Stopped from console. |
this._fireRecordingStopped(null, null); |
@@ -152,7 +150,6 @@ WebInspector.TimelineModelImpl.prototype = { |
_fireRecordingStarted: function() |
{ |
- this._collectionEnabled = true; |
this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStarted); |
}, |
@@ -162,7 +159,6 @@ WebInspector.TimelineModelImpl.prototype = { |
*/ |
_fireRecordingStopped: function(error, cpuProfile) |
{ |
- this._collectionEnabled = false; |
if (cpuProfile) |
WebInspector.TimelineJSProfileProcessor.mergeJSProfileIntoTimeline(this, cpuProfile); |
this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStopped); |