DevTools: Resume targets *after* stopping timeline recording.

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 40 matching lines @@
     this._toggleRecordAction = WebInspector.actionRegistry.action("timeline.toggle-recording");
 
     // Create models.
     this._tracingModelBackingStorage = new WebInspector.TempFileBackingStorage("tracing");
     this._tracingModel = new WebInspector.TracingModel(this._tracingModelBackingStorage);
     this._model = new WebInspector.TimelineModel(WebInspector.TimelineUIUtils.visibleEventsFilter());
     this._frameModel = new WebInspector.TracingTimelineFrameModel();
     if (Runtime.experiments.isEnabled("timelineLatencyInfo"))
         this._irModel = new WebInspector.TimelineIRModel();
 
-    this._controller = new WebInspector.TimelineController(this, this._tracingModel);
-
     if (Runtime.experiments.isEnabled("cpuThrottling"))
         this._cpuThrottlingManager = new WebInspector.CPUThrottlingManager();
 
     /** @type {!Array.<!WebInspector.TimelineModeView>} */
     this._currentViews = [];
 
     this._viewModeSetting = WebInspector.settings.createSetting("timelineViewMode", WebInspector.TimelinePanel.ViewMode.FlameChart);
     this._captureNetworkSetting = WebInspector.settings.createSetting("timelineCaptureNetwork", false);
     this._captureJSProfileSetting = WebInspector.settings.createSetting("timelineEnableJSSampling", true);
     this._captureMemorySetting = WebInspector.settings.createSetting("timelineCaptureMemory", false);
@@ skipping 529 matching lines @@
          * @param {!WebInspector.ToolbarButton} toolbarButton
          */
         function handler(toolbarButton)
         {
             toolbarButton.setEnabled(enabled);
         }
         this._recordingOptionUIControls.forEach(handler);
     },
 
     /**
+     * @return {?WebInspector.TimelineController}
+     */
+    _createController: function()

[caseq, 2016/03/17 21:28:22]

let's inline this.

[alph, 2016/03/17 21:36:50]

Done.

+    {
+        var mainTarget = WebInspector.targetManager.mainTarget();
+        return mainTarget ? new WebInspector.TimelineController(mainTarget, this, this._tracingModel) : null;
+    },
+
+    /**
      * @param {boolean} userInitiated
      */
     _startRecording: function(userInitiated)
     {
         console.assert(!this._statusPane, "Status pane is already opened.");
+        this._controller = this._createController();
+        if (!this._controller)
+            return;
         this._setState(WebInspector.TimelinePanel.State.StartPending);
         this._showRecordingStarted();
 
         this._autoRecordGeneration = userInitiated ? null : Symbol("Generation");
         this._controller.startRecording(true, this._captureJSProfileSetting.get(), this._captureMemorySetting.get(), this._captureLayersAndPicturesSetting.get(), this._captureFilmStripSetting && this._captureFilmStripSetting.get());
 
         for (var i = 0; i < this._overviewControls.length; ++i)
             this._overviewControls[i].timelineStarted();
 
         if (userInitiated)
             WebInspector.userMetrics.actionTaken(WebInspector.UserMetrics.Action.TimelineStarted);
         this._setUIControlsEnabled(false);
         this._hideRecordingHelpMessage();
     },
 
     _stopRecording: function()
     {
         if (this._statusPane) {
             this._statusPane.finish();
             this._statusPane.updateStatus(WebInspector.UIString("Stopping timeline\u2026"));
             this._statusPane.updateProgressBar(WebInspector.UIString("Received"), 0);
         }
         this._setState(WebInspector.TimelinePanel.State.StopPending);
         this._autoRecordGeneration = null;
         this._controller.stopRecording();
+        this._controller = null;
         this._setUIControlsEnabled(true);
     },
 
     _onSuspendStateChanged: function()
     {
         this._updateTimelineControls();
     },
 
     _updateTimelineControls: function()
     {
@@ skipping 1548 matching lines @@
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
         this._targets.remove(target, true);
     },
 
     __proto__: WebInspector.Object.prototype
 }