Attachment 362748 Details for Bug 194956 – Patch

[patch] Patch

bug-194956-20190222124126.patch (text/plain), 9.14 KB, created by Devin Rousso on 2019-02-22 12:41:27 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-02-22 12:41:27 PST

Size: 9.14 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 2193b6fab976b2c4c3f1918f58e7c3a3c923b118..f9ecd771ab466c17b42dc606327b71d1ddf2fb7a 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,30 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: Remove unused Timeline record selection code path
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index e938ebadb70c04114fa17009e593f3115554eff7..d59ade488747ec0b90fc53ad47ca46b89ebf730b 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -938,6 +938,7 @@ localizedStrings["Stop element selection (%s)"] = "Stop element selection (%s)";
> localizedStrings["Stop recording"] = "Stop recording";
> 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";
> localizedStrings["Style Attribute"] = "Style Attribute";
>diff --git a/Source/WebInspectorUI/UserInterface/Base/Setting.js b/Source/WebInspectorUI/UserInterface/Base/Setting.js
>index c5ee29256fcd5adab2094f7f61ac585df6e41e56..2b02ae46a93d0e2e67e7f90c4df63adba3a6208e 100644
>--- a/Source/WebInspectorUI/UserInterface/Base/Setting.js
>+++ b/Source/WebInspectorUI/UserInterface/Base/Setting.js
>@@ -150,6 +150,7 @@ WI.settings = {
>     showShadowDOM: new WI.Setting("show-shadow-dom", false),
>     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),
> 
>     // Experimental
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js b/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js
>index 8ca9d97ba4306ad142ff05376ed5372c62b74b64..90ccfc9a0dfca1fef1340aba374e4bc6cb8f40f5 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js
>@@ -39,6 +39,8 @@ WI.TimelineManager = class TimelineManager extends WI.Object
>         WI.heapManager.addEventListener(WI.HeapManager.Event.GarbageCollected, this._garbageCollected, this);
>         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());
> 
>         this._isCapturing = false;
>@@ -304,15 +306,7 @@ WI.TimelineManager = class TimelineManager extends WI.Object
> 
>         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;
>         this._isCapturingPageReload = false;
>@@ -847,6 +841,9 @@ WI.TimelineManager = class TimelineManager extends WI.Object
> 
>     _stopAutoRecordingSoon()
>     {
>+        if (!WI.settings.timelinesAutoStop.value)
>+            return;
>+
>         // Only auto stop when auto capturing.
>         if (!this._isCapturing || !this._mainResourceForAutoCapturing)
>             return;
>@@ -858,6 +855,9 @@ WI.TimelineManager = class TimelineManager extends WI.Object
> 
>     _resetAutoRecordingMaxTimeTimeout()
>     {
>+        if (!WI.settings.timelinesAutoStop.value)
>+            return;
>+
>         if (this._stopCapturingTimeout)
>             clearTimeout(this._stopCapturingTimeout);
>         this._stopCapturingTimeout = setTimeout(this._boundStopCapturing, WI.TimelineManager.MaximumAutoRecordDuration);
>@@ -865,6 +865,9 @@ WI.TimelineManager = class TimelineManager extends WI.Object
> 
>     _resetAutoRecordingDeadTimeTimeout()
>     {
>+        if (!WI.settings.timelinesAutoStop.value)
>+            return;
>+
>         // Only monitor dead time when auto capturing.
>         if (!this._isCapturing || !this._mainResourceForAutoCapturing)
>             return;
>@@ -948,6 +951,17 @@ WI.TimelineManager = class TimelineManager extends WI.Object
>         this.activeRecording.addMemoryPressureEvent(event.data.memoryPressureEvent);
>     }
> 
>+    _handleTimelinesAutoStopSettingChanged(event)
>+    {
>+        if (!this._isCapturing)
>+            return;
>+
>+        if (WI.settings.timelinesAutoStop.value)
>+            this._resetAutoRecordingMaxTimeTimeout();
>+        else
>+            this.relaxAutoStop();
>+    }
>+
>     _scriptProfilerTypeToScriptTimelineRecordType(type)
>     {
>         switch (type) {
>diff --git a/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js b/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js
>index a6d1066a9331464931e9cdfebf80d0b13c09903b..80d97d08925303ce3a0886f27a7db1be571efdf0 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js
>@@ -56,6 +56,12 @@ WI.TimelineRecordingContentView = class TimelineRecordingContentView extends WI.
>         this._timelineContentBrowser.navigationBar.addNavigationItem(this._filterBarNavigationItem);
>         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;
>         this._clearTimelineNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._clearTimeline, this);
>@@ -152,7 +158,11 @@ WI.TimelineRecordingContentView = class TimelineRecordingContentView extends WI.
> 
>     get navigationItems()
>     {
>-        return [this._clearTimelineNavigationItem];
>+        return [
>+            this._autoStopCheckboxNavigationItem,
>+            new WI.DividerNavigationItem,
>+            this._clearTimelineNavigationItem,
>+        ];
>     }
> 
>     get handleCopyEvent()
>@@ -536,6 +546,16 @@ WI.TimelineRecordingContentView = class TimelineRecordingContentView extends WI.
>         this._waitingToResetCurrentTime = false;
>     }
> 
>+    _handleAutoStopCheckboxCheckedDidChange(event)
>+    {
>+        WI.settings.timelinesAutoStop.value = this._autoStopCheckboxNavigationItem.checked;
>+    }
>+
>+    _handleTimelinesAutoStopSettingChanged(event)
>+    {
>+        this._autoStopCheckboxNavigationItem.checked = WI.settings.timelinesAutoStop.value;
>+    }
>+
>     _clearTimeline(event)
>     {
>         if (WI.timelineManager.activeRecording === this._recording && WI.timelineManager.isCapturing())

Actions: View | Formatted Diff | Diff

Attachments on bug 194956: 362739 | 362748 | 362749