Changeset 217317 in webkit

Timestamp:

May 23, 2017 6:09:18 PM (7 years ago)

Author:

Matt Baker

Message:

Web Inspector: content views are not restored on reload if its tree element is filtered out
​https://bugs.webkit.org/show_bug.cgi?id=165744
<rdar://problem/27461323>

Reviewed by Devin Rousso.

By default, NavigationSidebar should get the selected represented object
from its content browser, instead of relying on the tree selection. This
allows a filtered tree selection to persist across page loads.

• UserInterface/Views/NavigationSidebarPanel.js:

(WebInspector.NavigationSidebarPanel.prototype.get currentRepresentedObject):
(WebInspector.NavigationSidebarPanel.prototype.saveStateToCookie):
Get the represented object from the content browser instead of relying
on the tree selection (which can be filtered out).

(WebInspector.NavigationSidebarPanel.prototype._updateFilter):
(WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged):
(WebInspector.NavigationSidebarPanel.prototype._treeElementWasFiltered):
Reselect the represented object's tree element when it is shown due
to a change in the filter state.

(WebInspector.NavigationSidebarPanel.prototype.get hasSelectedElement): Deleted.
Not used.
(WebInspector.NavigationSidebarPanel.prototype.representedObjectWasFiltered): Deleted.
Not used. Replaced by _treeElementWasFiltered.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/NavigationSidebarPanel.js (modified) (6 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-05-23  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: content views are not restored on reload if its tree element is filtered out
+        https://bugs.webkit.org/show_bug.cgi?id=165744
+        <rdar://problem/27461323>
+
+        Reviewed by Devin Rousso.
+
+        By default, NavigationSidebar should get the selected represented object
+        from its content browser, instead of relying on the tree selection. This
+        allows a filtered tree selection to persist across page loads.
+
+        * UserInterface/Views/NavigationSidebarPanel.js:
+        (WebInspector.NavigationSidebarPanel.prototype.get currentRepresentedObject):
+        (WebInspector.NavigationSidebarPanel.prototype.saveStateToCookie):
+        Get the represented object from the content browser instead of relying
+        on the tree selection (which can be filtered out).
+
+        (WebInspector.NavigationSidebarPanel.prototype._updateFilter):
+        (WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged):
+        (WebInspector.NavigationSidebarPanel.prototype._treeElementWasFiltered):
+        Reselect the represented object's tree element when it is shown due
+        to a change in the filter state.
+
+        (WebInspector.NavigationSidebarPanel.prototype.get hasSelectedElement): Deleted.
+        Not used.
+        (WebInspector.NavigationSidebarPanel.prototype.representedObjectWasFiltered): Deleted.
+        Not used. Replaced by _treeElementWasFiltered.
+
 2017-05-23  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js

@@ -101 +101 @@
     }
 
-    get hasSelectedElement()
-    {
-        return !!this._contentTreeOutlineGroup.selectedTreeElement
+    get currentRepresentedObject()
+    {
+        if (!this._contentBrowser)
+            return null;
+
+        return this._contentBrowser.currentRepresentedObjects[0] || null;
     }
 
@@ -205 +208 @@
         console.assert(cookie);
 
-        // This does not save folder selections, which lack a represented object and content view.
-        var selectedTreeElement = null;
-        this.contentTreeOutlines.forEach(function(outline) {
-            if (outline.selectedTreeElement)
-                selectedTreeElement = outline.selectedTreeElement;
-        });
-
-        if (!selectedTreeElement)
-            return;
-
-        if (this._isTreeElementWithoutRepresentedObject(selectedTreeElement))
-            return;
-
-        var representedObject = selectedTreeElement.representedObject;
+        if (!this._contentBrowser)
+            return;
+
+        let representedObject = this.currentRepresentedObject;
+        if (!representedObject)
+            return;
+
         cookie[WebInspector.TypeIdentifierCookieKey] = representedObject.constructor.TypeIdentifier;
 
-        if (representedObject.saveIdentityToCookie)
+        if (representedObject.saveIdentityToCookie) {
             representedObject.saveIdentityToCookie(cookie);
-        else
-            console.error("Error: TreeElement.representedObject is missing a saveIdentityToCookie implementation. TreeElement.constructor: ", selectedTreeElement.constructor);
+            return;
+        }
+
+        console.error("NavigationSidebarPanel representedObject is missing a saveIdentityToCookie implementation.", representedObject);
     }
 
@@ -426 +424 @@
     // Protected
 
-    representedObjectWasFiltered(representedObject, filtered)
-    {
-        // Implemented by subclasses if needed.
-    }
-
     pruneStaleResourceTreeElements()
     {
@@ -571 +564 @@
                     this.applyFiltersToTreeElement(currentTreeElement);
                     if (currentTreeElementWasHidden !== currentTreeElement.hidden)
-                        this.representedObjectWasFiltered(currentTreeElement.representedObject, currentTreeElement.hidden);
+                        this._treeElementWasFiltered(currentTreeElement);
                 }
 
@@ -596 +589 @@
                 this.applyFiltersToTreeElement(currentTreeElement);
                 if (currentTreeElementWasHidden !== currentTreeElement.hidden)
-                    this.representedObjectWasFiltered(currentTreeElement.representedObject, currentTreeElement.hidden);
+                    this._treeElementWasFiltered(currentTreeElement);
             }
 
@@ -746 +739 @@
         return emptyContentPlaceholderElement;
     }
+
+    _treeElementWasFiltered(treeElement)
+    {
+        if (treeElement.selected || treeElement.hidden)
+            return;
+
+        let representedObject = this.currentRepresentedObject;
+        if (!representedObject || treeElement.representedObject !== representedObject)
+            return;
+
+        const omitFocus = true;
+        const selectedByUser = false;
+        const suppressOnSelect = true;
+        const suppressOnDeselect = true;
+        treeElement.revealAndSelect(omitFocus, selectedByUser, suppressOnSelect, suppressOnDeselect);
+    }
 };