DevTools: Support multiple target in TimelineModelImpl

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
+ * @implements {WebInspector.TargetManager.Observer}
  */
-WebInspector.TimelineModelImpl = function(timelineManager)
+WebInspector.TimelineModelImpl = function()
 {
     WebInspector.TimelineModel.call(this);
-    this._target = timelineManager.target();
-    this._timelineManager = timelineManager;
+    /** @type {?WebInspector.Target} */
+    this._currentTarget = null;
     this._filters = [];
     this._bindings = new WebInspector.TimelineModelImpl.InterRecordBindings();
 
     this.reset();
 
-    this._timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, this._onRecordAdded, this);
-    this._timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineStarted, this._onStarted, this);
-    this._timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineStopped, this._onStopped, this);
-    this._timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineProgress, this._onProgress, this);
+    WebInspector.targetManager.addModelListener(WebInspector.TimelineManager, WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, this._onRecordAdded, this);
+    WebInspector.targetManager.addModelListener(WebInspector.TimelineManager, WebInspector.TimelineManager.EventTypes.TimelineStarted, this._onStarted, this);
+    WebInspector.targetManager.addModelListener(WebInspector.TimelineManager, WebInspector.TimelineManager.EventTypes.TimelineStopped, this._onStopped, this);
+    WebInspector.targetManager.addModelListener(WebInspector.TimelineManager, WebInspector.TimelineManager.EventTypes.TimelineProgress, this._onProgress, this);
+    WebInspector.targetManager.observeTargets(this);
 }
 
 WebInspector.TimelineModelImpl.TransferChunkLengthBytes = 5000000;
 
 WebInspector.TimelineModelImpl.prototype = {
     /**
-     * @return {boolean}
+     * @param {!WebInspector.Target} target
      */
-    loadedFromFile: function()
+    targetAdded: function(target) { },
+
+    /**
+     * @param {!WebInspector.Target} target
+     */
+    targetRemoved: function(target)
     {
-        return this._loadedFromFile;
+        if (this._currentTarget === target)
+            this._currentTarget = null;
     },
 
     /**
      * @param {boolean} captureStacks
      * @param {boolean} captureMemory
      * @param {boolean} capturePictures
      */
     startRecording: function(captureStacks, captureMemory, capturePictures)
     {
         console.assert(!capturePictures, "Legacy timeline does not support capturing pictures");
+        this.reset();
+        this._currentTarget = WebInspector.context.flavor(WebInspector.Target);
+        if (!this._currentTarget)

[yurys, 2014/07/21 09:55:20]

How can this happen? Shouldn't we fail in this case?

+            return;
+
         this._clientInitiatedRecording = true;
-        this.reset();
         var maxStackFrames = captureStacks ? 30 : 0;
         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, WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled(), liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this));
+        this._currentTarget.timelineManager.start(maxStackFrames, WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled(), liveEvents.join(","), captureMemory, includeGPUEvents, this._fireRecordingStarted.bind(this));
     },
 
     stopRecording: function()
     {
+        if (!this._currentTarget)
+            return;
+
         if (!this._clientInitiatedRecording) {
-            this._timelineManager.start(undefined, undefined, undefined, undefined, undefined, stopTimeline.bind(this));
+            this._currentTarget.timelineManager.start(undefined, undefined, undefined, undefined, undefined, stopTimeline.bind(this));
             return;
         }
 
         /**
          * Console started this one and we are just sniffing it. Initiate recording so that we
          * could stop it.
          * @this {WebInspector.TimelineModelImpl}
          */
         function stopTimeline()
         {
-            this._timelineManager.stop(this._fireRecordingStopped.bind(this));
+            this._currentTarget.timelineManager.stop(this._fireRecordingStopped.bind(this));
         }
 
         this._clientInitiatedRecording = false;
-        this._timelineManager.stop(this._fireRecordingStopped.bind(this));
+        this._currentTarget.timelineManager.stop(this._fireRecordingStopped.bind(this));
     },
 
     /**
      * @return {!Array.<!WebInspector.TimelineModel.Record>}
      */
     records: function()
     {
         return this._records;
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onRecordAdded: function(event)
     {
-        if (this._collectionEnabled)
+        var timelineManager = /** @type {!WebInspector.TimelineManager} */ (event.target);
+        if (this._collectionEnabled && timelineManager.target() === this._currentTarget)
             this._addRecord(/** @type {!TimelineAgent.TimelineEvent} */(event.data));
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onStarted: function(event)
     {
-        if (event.data) {
-            // Started from console.
-            this._fireRecordingStarted();
+        if (!event.data || this._collectionEnabled)

[yurys, 2014/07/21 09:55:20]

Why do we need to also check this._collectionEnabled here?

[sergeyv, 2014/07/21 12:39:11]

we need it to prevent situation, when timeline was started in worker via button
and after it timeline in page was started from console. In this case we are just
ignoring second timeline

+            return;
+        // Started from console.
+        var timelineManager = /** @type {!WebInspector.TimelineManager} */ (event.target);
+        if (this._currentTarget !== timelineManager.target()) {
+            this.reset();
+            this._currentTarget = timelineManager.target();
         }
+        this._fireRecordingStarted();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onStopped: function(event)
     {
+        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())
+        if (WebInspector.experimentsSettings.timelineNoLiveUpdate.isEnabled()) {
             this.reset();
+            this._currentTarget = timelineManager.target();
+        }
         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);
+        var timelineManager = /** @type {!WebInspector.TimelineManager} */ (event.target);
+        if (timelineManager.target() === this._currentTarget)
+            this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingProgress, event.data);
     },
 
     _fireRecordingStarted: function()
     {
         this._collectionEnabled = true;
         this.dispatchEventToListeners(WebInspector.TimelineModel.Events.RecordingStarted);
     },
 
     /**
      * @param {?Protocol.Error} error
@@ skipping 94 matching lines @@
             if (!accepted)
                 return;
             var saver = new WebInspector.TimelineSaver(stream);
             saver.save(this._payloads, window.navigator.appVersion);
         }
         stream.open(fileName, callback.bind(this));
     },
 
     reset: function()
     {
-        this._loadedFromFile = false;
+        this._currentTarget = null;
         this._payloads = [];
         this._stringPool = {};
         this._bindings._reset();
         WebInspector.TimelineModel.prototype.reset.call(this);
     },
 
     /**
      * @param {!TimelineAgent.TimelineEvent} record
      */
     _internStrings: function(record)
@@ skipping 139 matching lines @@
     initiator: function()
     {
         return this._initiator;
     },
 
     /**
      * @return {?WebInspector.Target}
      */
     target: function()
     {
-        return this._model._target;
+        return this._model._currentTarget;
     },
 
     /**
      * @return {number}
      */
     selfTime: function()
     {
         return this._selfTime;
     },
 
@@ skipping 169 matching lines @@
             this._model.reset();
         }
 
         // Skip 0-th element - it is either version or 0.
         for (var i = 1, size = items.length; i < size; ++i)
             this._model._addRecord(items[i]);
     },
 
     close: function()
     {
-        this._model._loadedFromFile = true;
     }
 }
 
 /**
  * @constructor
  * @implements {WebInspector.OutputStreamDelegate}
  * @param {!WebInspector.TimelineModel} model
  * @param {!WebInspector.Progress} progress
  */
 WebInspector.TimelineModelLoadFromFileDelegate = function(model, progress)
@@ skipping 102 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));
     }
 }