Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3776)

Unified Diff: Source/devtools/front_end/timeline/TracingTimelineModel.js

Issue 326693002: Timeline: fix reset logic of TracingTimelineModel & co (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/timeline/TimelineTracingView.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/timeline/TracingTimelineModel.js
diff --git a/Source/devtools/front_end/timeline/TracingTimelineModel.js b/Source/devtools/front_end/timeline/TracingTimelineModel.js
index a2db0039c4f9eb52d124dcde3ba0a607e97b677c..6c950d3524a95ebf843b619db67051c9b4fd446a 100644
--- a/Source/devtools/front_end/timeline/TracingTimelineModel.js
+++ b/Source/devtools/front_end/timeline/TracingTimelineModel.js
@@ -101,6 +101,7 @@ WebInspector.TracingTimelineModel.prototype = {
*/
startRecording: function(captureStacks, captureMemory)
{
+ this.reset();
yurys 2014/06/10 07:04:27 This should go into _startRecordingWithCategories
var categories;
if (WebInspector.experimentsSettings.timelineTracingMode.isEnabled()) {
categories = WebInspector.TracingTimelineModel.defaultTracingCategoryFilter;
@@ -124,6 +125,7 @@ WebInspector.TracingTimelineModel.prototype = {
*/
setEventsForTest: function(sessionId, events)
{
+ this.reset();
this._didStartRecordingTraceEvents();
this._tracingModel.setEventsForTest(sessionId, events);
this._didStopRecordingTraceEvents();
@@ -139,7 +141,6 @@ WebInspector.TracingTimelineModel.prototype = {
_didStartRecordingTraceEvents: function()
{
- this.reset();
this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStarted);
},
« no previous file with comments | « Source/devtools/front_end/timeline/TimelineTracingView.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698