Timeline: fix reset logic of TracingTimelineModel & co

Source/devtools/front_end/timeline/TracingTimelineModel.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @param {!WebInspector.TracingModel} tracingModel
  * @constructor
  * @extends {WebInspector.TimelineModel}
  */
 WebInspector.TracingTimelineModel = function(tracingModel)
@@ skipping 83 matching lines @@
 
 WebInspector.TracingTimelineModel.defaultTracingCategoryFilter = "*,disabled-by-default-cc.debug,disabled-by-default-devtools.timeline";
 
 WebInspector.TracingTimelineModel.prototype = {
     /**
      * @param {boolean} captureStacks
      * @param {boolean} captureMemory
      */
     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;
         } else {
             var categoriesArray = ["disabled-by-default-devtools.timeline", "devtools"];
             if (captureStacks)
                 categoriesArray.push("disabled-by-default-devtools.timeline.stack");
             categories = categoriesArray.join(",");
         }
         this._startRecordingWithCategories(categories);
     },
 
     stopRecording: function()
     {
         this._tracingModel.stop(this._didStopRecordingTraceEvents.bind(this));
     },
 
     /**
      * @param {string} sessionId
      * @param {!Array.<!WebInspector.TracingModel.EventPayload>} events
      */
     setEventsForTest: function(sessionId, events)
     {
+        this.reset();
         this._didStartRecordingTraceEvents();
         this._tracingModel.setEventsForTest(sessionId, events);
         this._didStopRecordingTraceEvents();
     },
 
     /**
      * @param {string} categories
      */
     _startRecordingWithCategories: function(categories)
     {
         this._tracingModel.start(categories, "", this._didStartRecordingTraceEvents.bind(this));
     },
 
     _didStartRecordingTraceEvents: function()
     {
-        this.reset();
         this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStarted);
     },
 
     _didStopRecordingTraceEvents: function()
     {
         var events = this._tracingModel.devtoolsMetadataEvents();
         events.sort(WebInspector.TracingModel.Event.compareStartTime);
 
         this._resetProcessingState();
         for (var i = 0, length = events.length; i < length; i++) {
@@ skipping 489 matching lines @@
     {
         var tokens = [this.title()];
         var data = this._event.args.data;
         if (data) {
             for (var key in data)
                 tokens.push(data[key]);
         }
         return regExp.test(tokens.join("|"));
     }
 }