Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (238482 => 238483)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-11-25 21:44:43 UTC (rev 238483)
@@ -1,3 +1,47 @@
+2018-11-25 Matt Baker <mattba...@apple.com>
+
+ Web Inspector: Remove parameters from TreeOutline SelectionDidChange event
+ https://bugs.webkit.org/show_bug.cgi?id=191770
+
+ Reviewed by Devin Rousso.
+
+ * UserInterface/Controllers/CallFrameTreeController.js:
+ (WI.CallFrameTreeController.prototype._treeSelectionDidChange):
+ * UserInterface/Views/AuditNavigationSidebarPanel.js:
+ (WI.AuditNavigationSidebarPanel.prototype._treeSelectionDidChange):
+ * UserInterface/Views/CanvasSidebarPanel.js:
+ (WI.CanvasSidebarPanel):
+ (WI.CanvasSidebarPanel.prototype._treeSelectionDidChange):
+ (WI.CanvasSidebarPanel.prototype._treeOutlineSelectionDidChange): Deleted.
+ * UserInterface/Views/CanvasTabContentView.js:
+ (WI.CanvasTabContentView.prototype._canvasTreeOutlineSelectionDidChange):
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WI.DebuggerSidebarPanel.prototype._treeSelectionDidChange):
+ * UserInterface/Views/OpenResourceDialog.js:
+ (WI.OpenResourceDialog.prototype._treeSelectionDidChange):
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WI.ResourceSidebarPanel.prototype._treeSelectionDidChange):
+ * UserInterface/Views/SearchSidebarPanel.js:
+ (WI.SearchSidebarPanel.prototype._treeSelectionDidChange):
+ * UserInterface/Views/StorageSidebarPanel.js:
+ (WI.StorageSidebarPanel._treeSelectionDidChange):
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WI.TimelineDataGrid.prototype._popoverCallStackTreeSelectionDidChange):
+ (WI.TimelineDataGrid):
+ * UserInterface/Views/TimelineTabContentView.js:
+ (WI.TimelineTabContentView.prototype._recordingsTreeSelectionDidChange):
+ Use `event.target.selectedTreeElement` instead of `event.data.selectedElement`.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WI.TimelineOverview.prototype._timelinesTreeSelectionDidChange):
+ (WI.TimelineOverview.prototype._timelinesTreeSelectionDidChange.updateGraphSelectedState): Deleted.
+ Refactor away the single place `event.data.deselectedElement` was used.
+
+ * UserInterface/Views/TreeElement.js:
+ (WI.TreeElement.prototype.select):
+ (WI.TreeElement.prototype.deselect):
+ Remove `selectedElement` and `deselectedElement` from event data.
+
2018-11-19 Devin Rousso <drou...@apple.com>
Web Inspector: Audit: removing and re-adding the tab will duplicate tests
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CallFrameTreeController.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -76,7 +76,7 @@
_treeSelectionDidChange(event)
{
- this._showSourceCodeLocation(event.data.selectedElement);
+ this._showSourceCodeLocation(this._treeOutline.selectedTreeElement);
}
_showSourceCodeLocation(treeElement)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/AuditNavigationSidebarPanel.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/AuditNavigationSidebarPanel.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/AuditNavigationSidebarPanel.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -193,7 +193,7 @@
if (!this.selected)
return;
- let treeElement = event.data.selectedElement;
+ let treeElement = this.contentTreeOutline.selectedTreeElement;
if (!treeElement || treeElement instanceof WI.FolderTreeElement) {
this.showDefaultContentView();
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -72,8 +72,8 @@
this._recordingTreeOutline.customIndent = true;
this._recordingTreeOutline.registerScrollVirtualizer(this._recordingContentContainer, 20);
- this._canvasTreeOutline.addEventListener(WI.TreeOutline.Event.SelectionDidChange, this._treeOutlineSelectionDidChange, this);
- this._recordingTreeOutline.addEventListener(WI.TreeOutline.Event.SelectionDidChange, this._treeOutlineSelectionDidChange, this);
+ this._canvasTreeOutline.addEventListener(WI.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
+ this._recordingTreeOutline.addEventListener(WI.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
this._recordingProcessingOptionsContainer = null;
@@ -312,9 +312,9 @@
WI.FileUtilities.importJSON((result) => WI.canvasManager.processJSON(result));
}
- _treeOutlineSelectionDidChange(event)
+ _treeSelectionDidChange(event)
{
- let treeElement = event.data.selectedElement;
+ let treeElement = event.target.selectedTreeElement;
if (!treeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CanvasTabContentView.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -239,7 +239,7 @@
_canvasTreeOutlineSelectionDidChange(event)
{
- let selectedElement = event.data.selectedElement;
+ let selectedElement = this._canvasTreeOutline.selectedTreeElement;
if (!selectedElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -909,7 +909,7 @@
if (!this.selected)
return;
- let treeElement = event.data.selectedElement;
+ let treeElement = event.target.selectedTreeElement;
if (!treeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OpenResourceDialog.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -262,7 +262,7 @@
_treeSelectionDidChange(event)
{
- let treeElement = event.data.selectedElement;
+ let treeElement = this._treeOutline.selectedTreeElement;
if (!treeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -457,7 +457,7 @@
if (!this.selected)
return;
- let treeElement = event.data.selectedElement;
+ let treeElement = this.contentTreeOutline.selectedTreeElement;
if (!treeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -376,7 +376,7 @@
if (!this.selected)
return;
- let treeElement = event.data.selectedElement;
+ let treeElement = this.contentTreeOutline.selectedTreeElement;
if (!treeElement || treeElement instanceof WI.FolderTreeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -173,7 +173,7 @@
if (!this.selected)
return;
- let treeElement = event.data.selectedElement;
+ let treeElement = this.contentTreeOutline.selectedTreeElement;
if (!treeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -416,7 +416,7 @@
_popoverCallStackTreeSelectionDidChange(event)
{
- let treeElement = event.data.selectedElement;
+ let treeElement = this._popoverCallStackTreeOutline.selectedTreeElement;
if (!treeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -842,27 +842,17 @@
_timelinesTreeSelectionDidChange(event)
{
- function updateGraphSelectedState(timeline, selected)
- {
- let overviewGraph = this._overviewGraphsByTypeMap.get(timeline.type);
- console.assert(overviewGraph, "Missing overview graph for timeline", timeline);
- overviewGraph.selected = selected;
- }
-
- let selectedTreeElement = event.data.selectedElement;
- let deselectedTreeElement = event.data.deselectedElement;
let timeline = null;
+ let selectedTreeElement = this._timelinesTreeOutline.selectedTreeElement;
if (selectedTreeElement) {
timeline = selectedTreeElement.representedObject;
console.assert(timeline instanceof WI.Timeline, timeline);
console.assert(this._recording.timelines.get(timeline.type) === timeline, timeline);
- updateGraphSelectedState.call(this, timeline, true);
+ for (let [type, overviewGraph] of this._overviewGraphsByTypeMap)
+ overviewGraph.selected = type === timeline.type;
}
- if (deselectedTreeElement)
- updateGraphSelectedState.call(this, deselectedTreeElement.representedObject, false);
-
this._selectedTimeline = timeline;
this.dispatchEventToListeners(WI.TimelineOverview.Event.TimelineSelected);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -421,7 +421,7 @@
_recordingsTreeSelectionDidChange(event)
{
- let treeElement = event.data.selectedElement;
+ let treeElement = this._recordingsTreeOutline.selectedTreeElement;
if (!treeElement)
return;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeElement.js (238482 => 238483)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeElement.js 2018-11-25 21:35:18 UTC (rev 238482)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeElement.js 2018-11-25 21:44:43 UTC (rev 238483)
@@ -527,8 +527,7 @@
treeOutline.processingSelectionChange = true;
// Prevent dispatching a SelectionDidChange event for the deselected element if
- // it will be dispatched for the selected element. The event data includes both
- // the selected and deselected elements, so one event is.
+ // it will be dispatched for the selected element.
if (!suppressOnSelect)
suppressOnDeselect = true;
@@ -548,7 +547,7 @@
if (this.onselect)
this.onselect(this, selectedByUser);
- treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.SelectionDidChange, {selectedElement: this, deselectedElement, selectedByUser});
+ treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.SelectionDidChange, {selectedByUser});
}
treeOutline.processingSelectionChange = false;
@@ -581,7 +580,7 @@
if (this.ondeselect)
this.ondeselect(this);
- this.treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.SelectionDidChange, {deselectedElement: this});
+ this.treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.SelectionDidChange);
}
return true;
