Title: [267360] trunk/Source/WebInspectorUI
- Revision
- 267360
- Author
- [email protected]
- Date
- 2020-09-21 13:08:53 -0700 (Mon, 21 Sep 2020)
Log Message
Web Inspector: Timelines: remove "stop requested" marker
https://bugs.webkit.org/show_bug.cgi?id=216423
Patch by Patrick Angle <[email protected]> on 2020-09-21
Reviewed by Devin Rousso.
Removed the "Stop Requested" timeline marker, which was made unneccesary in r267038 which makes the recording
head marker stop at the moment the stop was requested, even if more time is required to complete the processing
of incoming data.
* UserInterface/Models/TimelineMarker.js:
* UserInterface/Views/TimelineOverview.js:
(WI.TimelineOverview):
(WI.TimelineOverview.prototype._recordingReset):
(WI.TimelineOverview.prototype._handleTimelineCapturingStateChanged):
* UserInterface/Views/TimelineRuler.css:
(.timeline-ruler > .markers > .marker.current-time::after):
(.timeline-ruler > .markers > .marker.stopping-time): Deleted.
(.timeline-ruler > .markers > .marker:matches(.stopping-time, .current-time)::after): Deleted.
(@media (prefers-color-scheme: dark) .timeline-ruler > .markers > .marker.stopping-time): Deleted.
* UserInterface/Views/TimelineRuler.js:
(WI.TimelineRuler.prototype.addMarker):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (267359 => 267360)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-09-21 20:07:01 UTC (rev 267359)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-09-21 20:08:53 UTC (rev 267360)
@@ -1,3 +1,27 @@
+2020-09-21 Patrick Angle <[email protected]>
+
+ Web Inspector: Timelines: remove "stop requested" marker
+ https://bugs.webkit.org/show_bug.cgi?id=216423
+
+ Reviewed by Devin Rousso.
+
+ Removed the "Stop Requested" timeline marker, which was made unneccesary in r267038 which makes the recording
+ head marker stop at the moment the stop was requested, even if more time is required to complete the processing
+ of incoming data.
+
+ * UserInterface/Models/TimelineMarker.js:
+ * UserInterface/Views/TimelineOverview.js:
+ (WI.TimelineOverview):
+ (WI.TimelineOverview.prototype._recordingReset):
+ (WI.TimelineOverview.prototype._handleTimelineCapturingStateChanged):
+ * UserInterface/Views/TimelineRuler.css:
+ (.timeline-ruler > .markers > .marker.current-time::after):
+ (.timeline-ruler > .markers > .marker.stopping-time): Deleted.
+ (.timeline-ruler > .markers > .marker:matches(.stopping-time, .current-time)::after): Deleted.
+ (@media (prefers-color-scheme: dark) .timeline-ruler > .markers > .marker.stopping-time): Deleted.
+ * UserInterface/Views/TimelineRuler.js:
+ (WI.TimelineRuler.prototype.addMarker):
+
2020-09-14 Patrick Angle <[email protected]>
Web Inspector: Stop Recording in Timelines tab doesn't work reliably
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js (267359 => 267360)
--- trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js 2020-09-21 20:07:01 UTC (rev 267359)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js 2020-09-21 20:08:53 UTC (rev 267360)
@@ -83,7 +83,6 @@
};
WI.TimelineMarker.Type = {
- StoppingTime: "stopping-time",
CurrentTime: "current-time",
LoadEvent: "load-event",
DOMContentEvent: "dom-content-event",
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (267359 => 267360)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2020-09-21 20:07:01 UTC (rev 267359)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2020-09-21 20:08:53 UTC (rev 267360)
@@ -83,7 +83,6 @@
this._timelineRuler.addEventListener(WI.TimelineRuler.Event.TimeRangeSelectionChanged, this._timeRangeSelectionChanged, this);
this.addSubview(this._timelineRuler);
- this._stoppingTimeMarker = null;
this._currentTimeMarker = new WI.TimelineMarker(0, WI.TimelineMarker.Type.CurrentTime);
this._timelineRuler.addMarker(this._currentTimeMarker);
@@ -816,11 +815,6 @@
this._timelineRuler.clearMarkers();
this._timelineRuler.addMarker(this._currentTimeMarker);
-
- if (this._stoppingTimeMarker) {
- this._stoppingTimeMarker.time = -1; // Hide the marker.
- this._timelineRuler.addMarker(this._stoppingTimeMarker);
- }
}
_canShowTimelineType(type)
@@ -1034,24 +1028,11 @@
_handleTimelineCapturingStateChanged(event)
{
switch (WI.timelineManager.capturingState) {
- case WI.TimelineManager.CapturingState.Starting:
- if (this._stoppingTimeMarker)
- this._stoppingTimeMarker.time = -1; // Hide the marker when capturing resumes.
- break;
-
case WI.TimelineManager.CapturingState.Active:
this._editInstrumentsButton.enabled = false;
this._stopEditingInstruments();
break;
- case WI.TimelineManager.CapturingState.Stopping:
- if (!this._stoppingTimeMarker) {
- this._stoppingTimeMarker = new WI.TimelineMarker(this._currentTime, WI.TimelineMarker.Type.StoppingTime);
- this._timelineRuler.addMarker(this._stoppingTimeMarker);
- } else
- this._stoppingTimeMarker.time = this._currentTime;
- break;
-
case WI.TimelineManager.CapturingState.Inactive:
this._editInstrumentsButton.enabled = true;
break;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css (267359 => 267360)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2020-09-21 20:07:01 UTC (rev 267359)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2020-09-21 20:08:53 UTC (rev 267360)
@@ -174,16 +174,12 @@
right: var(--timeline-ruler-marker-after-offset);
}
-.timeline-ruler > .markers > .marker.stopping-time {
- color: hsl(0, 0%, 75%);
-}
-
.timeline-ruler > .markers > .marker.current-time {
z-index: var(--timeline-current-time-z-index);
color: red;
}
-.timeline-ruler > .markers > .marker:matches(.stopping-time, .current-time)::after {
+.timeline-ruler > .markers > .marker.current-time::after {
top: var(--timeline-ruler-marker-after-offset);
width: var(--timeline-ruler-marker-after-size);
height: var(--timeline-ruler-marker-after-size);
@@ -294,10 +290,6 @@
}
@media (prefers-color-scheme: dark) {
- .timeline-ruler > .markers > .marker.stopping-time {
- color: lightgrey;
- }
-
.timeline-ruler > .markers > .marker.dom-content-event {
color: hsl(240, 100%, 70%);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (267359 => 267360)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2020-09-21 20:07:01 UTC (rev 267359)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2020-09-21 20:08:53 UTC (rev 267360)
@@ -348,9 +348,6 @@
markerElement.classList.add(marker.type, "marker");
switch (marker.type) {
- case WI.TimelineMarker.Type.StoppingTime:
- markerElement.title = WI.UIString("Recording stop requested \u2014 %s").format(Number.secondsToString(markerTime));
- break;
case WI.TimelineMarker.Type.LoadEvent:
markerElement.title = WI.UIString("Load \u2014 %s").format(Number.secondsToString(markerTime));
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
