Timeline: decouple TimelineFrameModel from TimelineModel

Source/devtools/front_end/timeline/TimelineModelImpl.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.
 
 /**
  * @constructor
  * @extends {WebInspector.TimelineModel}
  * @param {!WebInspector.TimelineManager} timelineManager
  */
 WebInspector.TimelineModelImpl = function(timelineManager)
@@ skipping 24 matching lines @@
 
     /**
      * @param {boolean} captureStacks
      * @param {boolean} captureMemory
      */
     startRecording: function(captureStacks, captureMemory)
     {
         this._clientInitiatedRecording = true;
         this.reset();
         var maxStackFrames = captureStacks ? 30 : 0;
-        this._bufferEvents = WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled();
         var includeGPUEvents = WebInspector.experimentsSettings.gpuTimeline.isEnabled();
         var liveEvents = [ WebInspector.TimelineModel.RecordType.BeginFrame,
                            WebInspector.TimelineModel.RecordType.DrawFrame,
                            WebInspector.TimelineModel.RecordType.RequestMainThreadFrame,
                            WebInspector.TimelineModel.RecordType.ActivateLayerTree ];
-        this._timelineManager.start(maxStackFrames, this._bufferEvents, liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this));
+        this._timelineManager.start(maxStackFrames, WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled(), liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this));
     },
 
     stopRecording: function()
     {
         if (!this._clientInitiatedRecording) {
             this._timelineManager.start(undefined, undefined, undefined, undefined, undefined, stopTimeline.bind(this));
             return;
         }
 
         /**
@@ skipping 36 matching lines @@
             // Started from console.
             this._fireRecordingStarted();
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _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();
         if (event.data) {
             // Stopped from console.
             this._fireRecordingStopped(null, null);
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onProgress: function(event)
     {
         this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingProgress, event.data);
     },
 
     _fireRecordingStarted: function()
     {
         this._collectionEnabled = true;
         this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStarted);
     },
 
     /**
      * @param {?Protocol.Error} error
      * @param {?ProfilerAgent.CPUProfile} cpuProfile
      */
     _fireRecordingStopped: function(error, cpuProfile)
     {
-        this._bufferEvents = false;
         this._collectionEnabled = false;
         if (cpuProfile)
             WebInspector.TimelineJSProfileProcessor.mergeJSProfileIntoTimeline(this, cpuProfile);
         this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStopped);
     },
 
     /**
-     * @return {boolean}
-     */
-    bufferEvents: function()
-    {
-        return this._bufferEvents;
-    },
-
-    /**
      * @param {!TimelineAgent.TimelineEvent} payload
      */
     _addRecord: function(payload)
     {
         this._internStrings(payload);
         this._payloads.push(payload);
 
         var record = this._innerAddRecord(payload, null);
         this._updateBoundaries(record);
         this._records.push(record);
@@ skipping 596 matching lines @@
                 break;
             length += itemLength;
             data.push(item);
             ++this._recordIndex;
         }
         if (this._recordIndex === this._payloads.length)
             data.push(data.pop() + "]");
         stream.write(data.join(separator), this._writeNextChunk.bind(this));
     }
 }