Timeline: rearrange trace completion logic for better extensibility

third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js

 // Copyright 2016 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
  * @param {!WebInspector.Target} target
  * @param {!WebInspector.TimelineLifecycleDelegate} delegate
  * @param {!WebInspector.TracingModel} tracingModel
  * @implements {WebInspector.TargetManager.Observer}
  * @implements {WebInspector.TracingManagerClient}
  */
 WebInspector.TimelineController = function(target, delegate, tracingModel)
 {
     this._delegate = delegate;
     this._target = target;
     this._tracingModel = tracingModel;
     this._targets = [];
-    this._allProfilesStoppedPromise = Promise.resolve();
-    this._targetsResumedPromise = Promise.resolve();
     WebInspector.targetManager.observeTargets(this);
 }
 
 WebInspector.TimelineController.prototype = {
     /**
      * @param {boolean} captureCauses
      * @param {boolean} enableJSSampling
      * @param {boolean} captureMemory
      * @param {boolean} capturePictures
      * @param {boolean} captureFilmStrip
@@ skipping 35 matching lines @@
         }
         if (captureFilmStrip)
             categoriesArray.push(disabledByDefault("devtools.screenshot"));
 
         var categories = categoriesArray.join(",");
         this._startRecordingWithCategories(categories, enableJSSampling);
     },
 
     stopRecording: function()
     {
-        this._allProfilesStoppedPromise = this._stopProfilingOnAllTargets();
+        var tracingStoppedPromises = [];
+        tracingStoppedPromises.push(new Promise(resolve => this._resolveTracingStoppedPromise = resolve));
+        tracingStoppedPromises.push.apply(tracingStoppedPromises, this._stopProfilingOnAllTargets());
+
+        Promise.all(tracingStoppedPromises).then(() => this._allSourcesFinished());
         this._target.tracingManager.stop();
-        this._targetsResumedPromise = WebInspector.targetManager.resumeAllTargets();
+        WebInspector.targetManager.resumeAllTargets();

[alph, 2016/07/11 22:21:01]

I think we still need this to have all targets resumed. so we can retrieve
scripts.

         this._delegate.loadingStarted();
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         this._targets.push(target);
@@ skipping 51 matching lines @@
         if (!cpuProfile) {
             WebInspector.console.warn(WebInspector.UIString("CPU profile for a target is not available. %s", error || ""));
             return;
         }
         if (!this._cpuProfiles)
             this._cpuProfiles = new Map();
         this._cpuProfiles.set(targetId, cpuProfile);
     },
 
     /**
-     * @return {!Promise}
+     * @return {!Array<!Promise>}
      */
     _stopProfilingOnAllTargets: function()
     {
         var targets = this._profiling ? this._targets : [];
         this._profiling = false;
-        return Promise.all(targets.map(this._stopProfilingOnTarget, this));
+        return targets.map(this._stopProfilingOnTarget, this);

[alph, 2016/07/11 22:21:01]

could you please revert it.

     },
 
     /**
      * @param {string} categories
      * @param {boolean=} enableJSSampling
      * @param {function(?string)=} callback
      */
     _startRecordingWithCategories: function(categories, enableJSSampling, callback)
     {
         WebInspector.targetManager.suspendAllTargets();
@@ skipping 32 matching lines @@
     traceEventsCollected: function(events)
     {
         this._tracingModel.addEvents(events);
     },
 
     /**
      * @override
      */
     tracingComplete: function()
     {
-        Promise.all([this._allProfilesStoppedPromise, this._targetsResumedPromise])
-            .then(this._didStopRecordingTraceEvents.bind(this));
+        this._resolveTracingStoppedPromise();

[alph, 2016/07/11 22:21:01]

The name is misleading. This is not a promise.

+        this._resolveTracingStoppedPromise = null;
     },
 
-    _didStopRecordingTraceEvents: function()
+    _allSourcesFinished: function()
     {
         this._injectCpuProfileEvents();
         this._tracingModel.tracingComplete();
         this._delegate.loadingComplete(true);
     },
 
     /**
      * @param {number} pid
      * @param {number} tid
      * @param {?ProfilerAgent.CPUProfile} cpuProfile
@@ skipping 52 matching lines @@
 
     /**
      * @param {number} progress
      * @override
      */
     eventsRetrievalProgress: function(progress)
     {
         this._delegate.loadingProgress(progress);
     }
 }