Title: [235142] trunk/Source/WebInspectorUI
- Revision
- 235142
- Author
- drou...@apple.com
- Date
- 2018-08-21 15:08:18 -0700 (Tue, 21 Aug 2018)
Log Message
Web Inspector: REGRESSION(r235095): duplicate actions existing in WI.CanvasSidebarPanel
https://bugs.webkit.org/show_bug.cgi?id=188808
Reviewed by Joseph Pecoraro.
* UserInterface/Views/CanvasSidebarPanel.js:
(WI.CanvasSidebarPanel.prototype._recordingChanged):
Check that the `WI.RecordingAction` is not already represented in the `WI.TreeOutline`
before adding it.
* UserInterface/Views/CanvasSidebarPanel.css:
(.sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline .item.processing .subtitle > progress):
Drive-by: vertically center the <progress> shown for `WI.RecordingFrame` during processing.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (235141 => 235142)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-08-21 21:22:58 UTC (rev 235141)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-08-21 22:08:18 UTC (rev 235142)
@@ -1,5 +1,21 @@
2018-08-21 Devin Rousso <drou...@apple.com>
+ Web Inspector: REGRESSION(r235095): duplicate actions existing in WI.CanvasSidebarPanel
+ https://bugs.webkit.org/show_bug.cgi?id=188808
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/CanvasSidebarPanel.js:
+ (WI.CanvasSidebarPanel.prototype._recordingChanged):
+ Check that the `WI.RecordingAction` is not already represented in the `WI.TreeOutline`
+ before adding it.
+
+ * UserInterface/Views/CanvasSidebarPanel.css:
+ (.sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline .item.processing .subtitle > progress):
+ Drive-by: vertically center the <progress> shown for `WI.RecordingFrame` during processing.
+
+2018-08-21 Devin Rousso <drou...@apple.com>
+
Web Inspector: Canvas: provide default icon for all actions
https://bugs.webkit.org/show_bug.cgi?id=188807
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css (235141 => 235142)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css 2018-08-21 21:22:58 UTC (rev 235141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css 2018-08-21 22:08:18 UTC (rev 235142)
@@ -75,7 +75,8 @@
.sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline .item.processing .subtitle > progress {
width: 100%;
max-width: 100px;
- margin: 2px 4px 0;
+ margin: 0 4px;
+ vertical-align: -3px;
}
.sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline:matches(:focus, .force-focus) .item.processing.selected .subtitle > progress {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js (235141 => 235142)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js 2018-08-21 21:22:58 UTC (rev 235141)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js 2018-08-21 22:08:18 UTC (rev 235142)
@@ -407,11 +407,12 @@
scopeBarItem.selected = true;
}
- if (this._recording.actions[0].ready) {
- this._recordingTreeOutline.appendChild(new WI.RecordingActionTreeElement(this._recording.actions[0], 0, this._recording.type));
+ let initialStateAction = this._recording.actions[0];
+ if (initialStateAction.ready && !this._recordingTreeOutline.getCachedTreeElement(initialStateAction)) {
+ this._recordingTreeOutline.appendChild(new WI.RecordingActionTreeElement(initialStateAction, 0, this._recording.type));
if (!this._recording[WI.CanvasSidebarPanel.SelectedActionSymbol])
- this.action = ""
+ this.action = ""
}
let cumulativeActionIndex = 0;
@@ -419,14 +420,16 @@
if (!frame.actions[0].ready)
return;
- let folder = this._createRecordingFrameTreeElement(frame, frameIndex, this._recordingTreeOutline);
+ let folder = this._recordingTreeOutline.getCachedTreeElement(frame);
+ if (!folder)
+ folder = this._createRecordingFrameTreeElement(frame, frameIndex, this._recordingTreeOutline);
for (let action of frame.actions) {
- if (!action.ready)
+ ++cumulativeActionIndex;
+
+ if (!action.ready || this._recordingTreeOutline.getCachedTreeElement(action))
break;
- ++cumulativeActionIndex;
-
this._createRecordingActionTreeElement(action, cumulativeActionIndex, folder);
}
});
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
