Changeset 267360 in webkit
- Timestamp:
- Sep 21, 2020, 1:08:53 PM (6 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 5 edited
-
ChangeLog (modified) (1 diff)
-
UserInterface/Models/TimelineMarker.js (modified) (1 diff)
-
UserInterface/Views/TimelineOverview.js (modified) (3 diffs)
-
UserInterface/Views/TimelineRuler.css (modified) (3 diffs)
-
UserInterface/Views/TimelineRuler.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r267038 r267360 1 2020-09-21 Patrick Angle <pangle@apple.com> 2 3 Web Inspector: Timelines: remove "stop requested" marker 4 https://bugs.webkit.org/show_bug.cgi?id=216423 5 6 Reviewed by Devin Rousso. 7 8 Removed the "Stop Requested" timeline marker, which was made unneccesary in r267038 which makes the recording 9 head marker stop at the moment the stop was requested, even if more time is required to complete the processing 10 of incoming data. 11 12 * UserInterface/Models/TimelineMarker.js: 13 * UserInterface/Views/TimelineOverview.js: 14 (WI.TimelineOverview): 15 (WI.TimelineOverview.prototype._recordingReset): 16 (WI.TimelineOverview.prototype._handleTimelineCapturingStateChanged): 17 * UserInterface/Views/TimelineRuler.css: 18 (.timeline-ruler > .markers > .marker.current-time::after): 19 (.timeline-ruler > .markers > .marker.stopping-time): Deleted. 20 (.timeline-ruler > .markers > .marker:matches(.stopping-time, .current-time)::after): Deleted. 21 (@media (prefers-color-scheme: dark) .timeline-ruler > .markers > .marker.stopping-time): Deleted. 22 * UserInterface/Views/TimelineRuler.js: 23 (WI.TimelineRuler.prototype.addMarker): 24 1 25 2020-09-14 Patrick Angle <pangle@apple.com> 2 26 -
trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js
r252199 r267360 84 84 85 85 WI.TimelineMarker.Type = { 86 StoppingTime: "stopping-time",87 86 CurrentTime: "current-time", 88 87 LoadEvent: "load-event", -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js
r261108 r267360 84 84 this.addSubview(this._timelineRuler); 85 85 86 this._stoppingTimeMarker = null;87 86 this._currentTimeMarker = new WI.TimelineMarker(0, WI.TimelineMarker.Type.CurrentTime); 88 87 this._timelineRuler.addMarker(this._currentTimeMarker); … … 817 816 818 817 this._timelineRuler.addMarker(this._currentTimeMarker); 819 820 if (this._stoppingTimeMarker) {821 this._stoppingTimeMarker.time = -1; // Hide the marker.822 this._timelineRuler.addMarker(this._stoppingTimeMarker);823 }824 818 } 825 819 … … 1035 1029 { 1036 1030 switch (WI.timelineManager.capturingState) { 1037 case WI.TimelineManager.CapturingState.Starting:1038 if (this._stoppingTimeMarker)1039 this._stoppingTimeMarker.time = -1; // Hide the marker when capturing resumes.1040 break;1041 1042 1031 case WI.TimelineManager.CapturingState.Active: 1043 1032 this._editInstrumentsButton.enabled = false; 1044 1033 this._stopEditingInstruments(); 1045 break;1046 1047 case WI.TimelineManager.CapturingState.Stopping:1048 if (!this._stoppingTimeMarker) {1049 this._stoppingTimeMarker = new WI.TimelineMarker(this._currentTime, WI.TimelineMarker.Type.StoppingTime);1050 this._timelineRuler.addMarker(this._stoppingTimeMarker);1051 } else1052 this._stoppingTimeMarker.time = this._currentTime;1053 1034 break; 1054 1035 -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css
r265237 r267360 175 175 } 176 176 177 .timeline-ruler > .markers > .marker.stopping-time {178 color: hsl(0, 0%, 75%);179 }180 181 177 .timeline-ruler > .markers > .marker.current-time { 182 178 z-index: var(--timeline-current-time-z-index); … … 184 180 } 185 181 186 .timeline-ruler > .markers > .marker :matches(.stopping-time, .current-time)::after {182 .timeline-ruler > .markers > .marker.current-time::after { 187 183 top: var(--timeline-ruler-marker-after-offset); 188 184 width: var(--timeline-ruler-marker-after-size); … … 295 291 296 292 @media (prefers-color-scheme: dark) { 297 .timeline-ruler > .markers > .marker.stopping-time {298 color: lightgrey;299 }300 301 293 .timeline-ruler > .markers > .marker.dom-content-event { 302 294 color: hsl(240, 100%, 70%); -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js
r252199 r267360 349 349 350 350 switch (marker.type) { 351 case WI.TimelineMarker.Type.StoppingTime:352 markerElement.title = WI.UIString("Recording stop requested \u2014 %s").format(Number.secondsToString(markerTime));353 break;354 351 case WI.TimelineMarker.Type.LoadEvent: 355 352 markerElement.title = WI.UIString("Load \u2014 %s").format(Number.secondsToString(markerTime));
Note:
See TracChangeset
for help on using the changeset viewer.