Changeset 241982 in webkit

Timestamp:

Feb 22, 2019 8:17:58 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Timelines: add UI for preventing auto-stop
​https://bugs.webkit.org/show_bug.cgi?id=194956

Reviewed by Joseph Pecoraro.

Add a checkbox to the navigation area of the Timelines tab that controls whether recordings
automatically stop (e.g. after "load" or a period of inactivity).

• UserInterface/Views/TimelineRecordingContentView.js:

(WI.TimelineRecordingContentView):
(WI.TimelineRecordingContentView.prototype.get navigationItems):
(WI.TimelineRecordingContentView.prototype._handleAutoStopCheckboxCheckedDidChange): Added.
(WI.TimelineRecordingContentView.prototype._handleTimelinesAutoStopSettingChanged): Added.

• UserInterface/Controllers/TimelineManager.js:

(WI.TimelineManager):
(WI.TimelineManager.prototype.capturingStopped):
(WI.TimelineManager.prototype._stopAutoRecordingSoon):
(WI.TimelineManager.prototype._resetAutoRecordingMaxTimeTimeout):
(WI.TimelineManager.prototype._resetAutoRecordingDeadTimeTimeout):
(WI.TimelineManager.prototype._handleTimelinesAutoStopSettingChanged):

• UserInterface/Base/Setting.js:
• Localizations/en.lproj/localizedStrings.js:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Base/Setting.js (modified) (1 diff)
• UserInterface/Controllers/TimelineManager.js (modified) (6 diffs)
• UserInterface/Views/TimelineRecordingContentView.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-02-22  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Timelines: add UI for preventing auto-stop
+        https://bugs.webkit.org/show_bug.cgi?id=194956
+
+        Reviewed by Joseph Pecoraro.
+
+        Add a checkbox to the navigation area of the Timelines tab that controls whether recordings
+        automatically stop (e.g. after "load" or a period of inactivity).
+
+        * UserInterface/Views/TimelineRecordingContentView.js:
+        (WI.TimelineRecordingContentView):
+        (WI.TimelineRecordingContentView.prototype.get navigationItems):
+        (WI.TimelineRecordingContentView.prototype._handleAutoStopCheckboxCheckedDidChange): Added.
+        (WI.TimelineRecordingContentView.prototype._handleTimelinesAutoStopSettingChanged): Added.
+
+        * UserInterface/Controllers/TimelineManager.js:
+        (WI.TimelineManager):
+        (WI.TimelineManager.prototype.capturingStopped):
+        (WI.TimelineManager.prototype._stopAutoRecordingSoon):
+        (WI.TimelineManager.prototype._resetAutoRecordingMaxTimeTimeout):
+        (WI.TimelineManager.prototype._resetAutoRecordingDeadTimeTimeout):
+        (WI.TimelineManager.prototype._handleTimelinesAutoStopSettingChanged):
+
+        * UserInterface/Base/Setting.js:
+        * Localizations/en.lproj/localizedStrings.js:
+
 2019-02-22  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -939 +939 @@
 localizedStrings["Stop recording (%s)"] = "Stop recording (%s)";
 localizedStrings["Stop recording canvas actions"] = "Stop recording canvas actions";
+localizedStrings["Stop recording once page loads"] = "Stop recording once page loads";
 localizedStrings["Stopping the \u201C%s\u201D audit"] = "Stopping the \u201C%s\u201D audit";
 localizedStrings["Storage"] = "Storage";

trunk/Source/WebInspectorUI/UserInterface/Base/Setting.js

@@ -151 +151 @@
     showWhitespaceCharacters: new WI.Setting("show-whitespace-characters", false),
     tabSize: new WI.Setting("tab-size", 4),
+    timelinesAutoStop: new WI.Setting("timelines-auto-stop", true),
     zoomFactor: new WI.Setting("zoom-factor", 1),
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js

@@ -40 +40 @@
         WI.memoryManager.addEventListener(WI.MemoryManager.Event.MemoryPressure, this._memoryPressure, this);
 
+        WI.settings.timelinesAutoStop.addEventListener(WI.Setting.Event.Changed, this._handleTimelinesAutoStopSettingChanged, this);
+
         this._enabledTimelineTypesSetting = new WI.Setting("enabled-instrument-types", WI.TimelineManager.defaultTimelineTypes());
 
@@ -305 +307 @@
         WI.DOMNode.removeEventListener(null, null, this);
 
-        if (this._stopCapturingTimeout) {
-            clearTimeout(this._stopCapturingTimeout);
-            this._stopCapturingTimeout = undefined;
-        }
-
-        if (this._deadTimeTimeout) {
-            clearTimeout(this._deadTimeTimeout);
-            this._deadTimeTimeout = undefined;
-        }
+        this.relaxAutoStop();
 
         this._isCapturing = false;
@@ -848 +842 @@
     _stopAutoRecordingSoon()
     {
+        if (!WI.settings.timelinesAutoStop.value)
+            return;
+
         // Only auto stop when auto capturing.
         if (!this._isCapturing || !this._mainResourceForAutoCapturing)
@@ -859 +856 @@
     _resetAutoRecordingMaxTimeTimeout()
     {
+        if (!WI.settings.timelinesAutoStop.value)
+            return;
+
         if (this._stopCapturingTimeout)
             clearTimeout(this._stopCapturingTimeout);
@@ -866 +866 @@
     _resetAutoRecordingDeadTimeTimeout()
     {
+        if (!WI.settings.timelinesAutoStop.value)
+            return;
+
         // Only monitor dead time when auto capturing.
         if (!this._isCapturing || !this._mainResourceForAutoCapturing)
@@ -947 +950 @@
 
         this.activeRecording.addMemoryPressureEvent(event.data.memoryPressureEvent);
+    }
+
+    _handleTimelinesAutoStopSettingChanged(event)
+    {
+        if (!this._isCapturing)
+            return;
+
+        if (WI.settings.timelinesAutoStop.value)
+            this._resetAutoRecordingMaxTimeTimeout();
+        else
+            this.relaxAutoStop();
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js

@@ -57 +57 @@
         this.addSubview(this._timelineContentBrowser);
 
+        this._autoStopCheckboxNavigationItem = new WI.CheckboxNavigationItem("auto-stop-recording", WI.UIString("Stop recording once page loads"), WI.settings.timelinesAutoStop.value);
+        this._autoStopCheckboxNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
+        this._autoStopCheckboxNavigationItem.addEventListener(WI.CheckboxNavigationItem.Event.CheckedDidChange, this._handleAutoStopCheckboxCheckedDidChange, this);
+
+        WI.settings.timelinesAutoStop.addEventListener(WI.Setting.Event.Changed, this._handleTimelinesAutoStopSettingChanged, this);
+
         this._clearTimelineNavigationItem = new WI.ButtonNavigationItem("clear-timeline", WI.UIString("Clear Timeline (%s)").format(WI.clearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
         this._clearTimelineNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
@@ -153 +159 @@
     get navigationItems()
     {
-        return [this._clearTimelineNavigationItem];
+        return [
+            this._autoStopCheckboxNavigationItem,
+            new WI.DividerNavigationItem,
+            this._clearTimelineNavigationItem,
+        ];
     }
 
@@ -535 +545 @@
         this._recording.removeEventListener(WI.TimelineRecording.Event.TimesUpdated, this._recordingTimesUpdated, this);
         this._waitingToResetCurrentTime = false;
+    }
+
+    _handleAutoStopCheckboxCheckedDidChange(event)
+    {
+        WI.settings.timelinesAutoStop.value = this._autoStopCheckboxNavigationItem.checked;
+    }
+
+    _handleTimelinesAutoStopSettingChanged(event)
+    {
+        this._autoStopCheckboxNavigationItem.checked = WI.settings.timelinesAutoStop.value;
     }