Title: [205946] trunk/Source/WebInspectorUI
Revision
205946
Author
[email protected]
Date
2016-09-14 21:54:37 -0700 (Wed, 14 Sep 2016)

Log Message

Web Inspector: Call frame is sometimes not selected in Debugger sidebar on initial pause
https://bugs.webkit.org/show_bug.cgi?id=161835
<rdar://problem/28236680>

Reviewed by Joseph Pecoraro.

* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel):
(WebInspector.NavigationSidebarPanel.prototype._contentTreeOutlineTreeSelectionDidChange):
If a tree other than the newly selected element's tree has the selection,
deselect it to prevent multiple tree selections.
(WebInspector.NavigationSidebarPanel.prototype.show): Deleted.
Not needed since the selected tree is no longer tracked. Incidentally,
SidebarPanel.show was only called by SearchSidebarPanel, which doesn't need
to manage selection across multiple tree outlines.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (205945 => 205946)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-09-15 04:32:20 UTC (rev 205945)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-09-15 04:54:37 UTC (rev 205946)
@@ -1,5 +1,23 @@
 2016-09-14  Matt Baker  <[email protected]>
 
+        Web Inspector: Call frame is sometimes not selected in Debugger sidebar on initial pause
+        https://bugs.webkit.org/show_bug.cgi?id=161835
+        <rdar://problem/28236680>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/NavigationSidebarPanel.js:
+        (WebInspector.NavigationSidebarPanel):
+        (WebInspector.NavigationSidebarPanel.prototype._contentTreeOutlineTreeSelectionDidChange):
+        If a tree other than the newly selected element's tree has the selection,
+        deselect it to prevent multiple tree selections.
+        (WebInspector.NavigationSidebarPanel.prototype.show): Deleted.
+        Not needed since the selected tree is no longer tracked. Incidentally,
+        SidebarPanel.show was only called by SearchSidebarPanel, which doesn't need
+        to manage selection across multiple tree outlines.
+
+2016-09-14  Matt Baker  <[email protected]>
+
         Web Inspector: Call Stack tree in the Debugger sidebar should mark the active call frame
         https://bugs.webkit.org/show_bug.cgi?id=161945
         <rdar://problem/28293451>

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (205945 => 205946)


--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2016-09-15 04:32:20 UTC (rev 205945)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2016-09-15 04:54:37 UTC (rev 205946)
@@ -36,7 +36,6 @@
         this.contentView.element.addEventListener("scroll", this.soon._updateContentOverflowShadowVisibility);
 
         this._contentTreeOutline = this.createContentTreeOutline(true);
-        this._selectedContentTreeOutline = null;
 
         this._filterBar = new WebInspector.FilterBar;
         this._filterBar.addEventListener(WebInspector.FilterBar.Event.FilterDidChange, this._filterDidChange, this);
@@ -440,21 +439,6 @@
         treeElement.hidden = true;
     }
 
-    show()
-    {
-        if (!this.parentSidebar)
-            return;
-
-        super.show();
-
-        let treeOutline = this._selectedContentTreeOutline;
-        if (!treeOutline && this._visibleContentTreeOutlines.length)
-            treeOutline = this._visibleContentTreeOutlines[0];
-
-        if (treeOutline)
-            treeOutline.element.focus();
-    }
-
     shown()
     {
         super.shown();
@@ -678,15 +662,17 @@
         if (!selectedElement)
             return;
 
-        // Prevent two selections in the sidebar, if the selected tree outline is changing.
-        let treeOutline = selectedElement.treeOutline;
-        if (this._selectedContentTreeOutline && this._selectedContentTreeOutline !== treeOutline) {
-            if (this._selectedContentTreeOutline.selectedTreeElement)
-                this._selectedContentTreeOutline.selectedTreeElement.deselect();
+        // Prevent two selections in the sidebar.
+        let selectedTreeOutline = selectedElement.treeOutline;
+        for (let treeOutline of this._visibleContentTreeOutlines) {
+            if (selectedTreeOutline === treeOutline)
+                continue;
+
+            if (treeOutline.selectedTreeElement) {
+                treeOutline.selectedTreeElement.deselect();
+                break;
+            }
         }
-
-        treeOutline[WebInspector.NavigationSidebarPanel.PreviousSelectedTreeElementSymbol] = null;
-        this._selectedContentTreeOutline = treeOutline;
     }
 
     _checkForStaleResourcesIfNeeded()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to