Changeset 224499 in webkit

Timestamp:

Nov 6, 2017 10:56:38 AM (6 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Selecting a DOM Search Result in Search Tab unexpectedly changes Tabs
​https://bugs.webkit.org/show_bug.cgi?id=179223
<rdar://problem/33949556>

Reviewed by Devin Rousso.

• Localizations/en.lproj/localizedStrings.js:

New string.

• UserInterface/Views/SearchResultTreeElement.js:

(WI.SearchResultTreeElement.prototype.populateContextMenu):
Add a context menu for search results to jump to a different tab.
These behaviors match the double click behavior for search results.

• UserInterface/Views/SearchTabContentView.js:

(WI.SearchTabContentView.prototype.canShowRepresentedObject):
Always support showing a DOM Tree. Clients should be using
ignoreSearchTab if they don't want to jump here.

• UserInterface/Views/DOMTreeDataGridNode.js:

(WI.DOMTreeDataGridNode.prototype._goToArrowWasClicked):

• UserInterface/Views/LayerTreeDataGridNode.js:

(WI.LayerTreeDataGridNode.prototype._goToArrowWasClicked):
Use ignoreSearchTab just in case when showing a DOM Tree.

• UserInterface/Views/ContentBrowser.js:

(WI.ContentBrowser.prototype.shown):
When showing, update our UI to reflect the values of the current content view, which
for a while may have been owned by another ContentBrowser.

(WI.ContentBrowser.prototype._contentViewSelectionPathComponentDidChange):
(WI.ContentBrowser.prototype._contentViewSupplementalRepresentedObjectsDidChange):
(WI.ContentBrowser.prototype._contentViewNavigationItemsDidChange):
We can avoid work in a few places where we might not be the owning ContentBrowser
of a ContentView that is changing.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Views/ContentBrowser.js (modified) (4 diffs)
• UserInterface/Views/DOMTreeDataGridNode.js (modified) (1 diff)
• UserInterface/Views/LayerTreeDataGridNode.js (modified) (1 diff)
• UserInterface/Views/SearchResultTreeElement.js (modified) (1 diff)
• UserInterface/Views/SearchTabContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-11-06  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Selecting a DOM Search Result in Search Tab unexpectedly changes Tabs
+        https://bugs.webkit.org/show_bug.cgi?id=179223
+        <rdar://problem/33949556>
+
+        Reviewed by Devin Rousso.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        New string.
+
+        * UserInterface/Views/SearchResultTreeElement.js:
+        (WI.SearchResultTreeElement.prototype.populateContextMenu):
+        Add a context menu for search results to jump to a different tab.
+        These behaviors match the double click behavior for search results.
+
+        * UserInterface/Views/SearchTabContentView.js:
+        (WI.SearchTabContentView.prototype.canShowRepresentedObject):
+        Always support showing a DOM Tree. Clients should be using
+        ignoreSearchTab if they don't want to jump here.
+
+        * UserInterface/Views/DOMTreeDataGridNode.js:
+        (WI.DOMTreeDataGridNode.prototype._goToArrowWasClicked):
+        * UserInterface/Views/LayerTreeDataGridNode.js:
+        (WI.LayerTreeDataGridNode.prototype._goToArrowWasClicked):
+        Use ignoreSearchTab just in case when showing a DOM Tree.
+
+        * UserInterface/Views/ContentBrowser.js:
+        (WI.ContentBrowser.prototype.shown):
+        When showing, update our UI to reflect the values of the current content view, which
+        for a while may have been owned by another ContentBrowser.
+
+        (WI.ContentBrowser.prototype._contentViewSelectionPathComponentDidChange):
+        (WI.ContentBrowser.prototype._contentViewSupplementalRepresentedObjectsDidChange):
+        (WI.ContentBrowser.prototype._contentViewNavigationItemsDidChange):
+        We can avoid work in a few places where we might not be the owning ContentBrowser
+        of a ContentView that is changing.
+
 2017-11-05  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -779 +779 @@
 localizedStrings["Reveal in DOM Tree"] = "Reveal in DOM Tree";
 localizedStrings["Reveal in Debugger Tab"] = "Reveal in Debugger Tab";
+localizedStrings["Reveal in Elements Tab"] = "Reveal in Elements Tab";
 localizedStrings["Reveal in Original Resource"] = "Reveal in Original Resource";
 localizedStrings["Reveal in Resources Tab"] = "Reveal in Resources Tab";

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -1783 +1783 @@
 
     this.showElementsTab();
-    this.showMainFrameDOMTree(event.data.node);
+    this.showMainFrameDOMTree(event.data.node, {ignoreSearchTab: true});
 };
 

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

@@ -232 +232 @@
     shown()
     {
+        this._updateContentViewSelectionPathNavigationItem(this.currentContentView);
+        this.updateHierarchicalPathForCurrentContentView()
+
         this._contentViewContainer.shown();
     }
@@ -488 +491 @@
             return;
 
+        // If the ContentView is a tombstone within our ContentViewContainer, do nothing. Let the owning ContentBrowser react.
+        if (event.target.parentContainer !== this._contentViewContainer)
+            return;
+
         this._updateContentViewSelectionPathNavigationItem(event.target);
         this._updateBackForwardButtons();
@@ -501 +508 @@
     {
         if (event.target !== this.currentContentView)
+            return;
+
+        // If the ContentView is a tombstone within our ContentViewContainer, do nothing. Let the owning ContentBrowser react.
+        if (event.target.parentContainer !== this._contentViewContainer)
             return;
 
@@ -527 +538 @@
     {
         if (event.target !== this.currentContentView)
+            return;
+
+        // If the ContentView is a tombstone within our ContentViewContainer, do nothing. Let the owning ContentBrowser react.
+        if (event.target.parentContainer !== this._contentViewContainer)
             return;
 

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

@@ -65 +65 @@
     _goToArrowWasClicked()
     {
-        WI.showMainFrameDOMTree(this._domNode);
+        WI.showMainFrameDOMTree(this._domNode, {ignoreSearchTab: true});
     }
 };

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

@@ -161 +161 @@
     {
         var domNode = WI.domTreeManager.nodeForId(this._layer.nodeId);
-        WI.showMainFrameDOMTree(domNode);
+        WI.showMainFrameDOMTree(domNode, {ignoreSearchTab: true});
     }
 };

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

@@ -90 +90 @@
         return this.representedObject.sourceCodeTextRange.synthesizedTextValue + ":" + this.representedObject.title;
     }
+
+    // Protected
+
+    populateContextMenu(contextMenu, event)
+    {
+        if (this.representedObject instanceof WI.DOMSearchMatchObject) {
+            contextMenu.appendItem(WI.UIString("Reveal in Elements Tab"), () => {
+                WI.showMainFrameDOMTree(this.representedObject.domNode, {
+                    ignoreSearchTab: true,
+                });
+            });
+        } else if (this.representedObject instanceof WI.SourceCodeSearchMatchObject) {
+            contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
+                WI.showOriginalOrFormattedSourceCodeTextRange(this.representedObject.sourceCodeTextRange, {
+                    ignoreNetworkTab: true,
+                    ignoreSearchTab: true,
+                });
+            });
+        }
+
+        super.populateContextMenu(contextMenu, event);
+    }
 };

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

@@ -71 +71 @@
     canShowRepresentedObject(representedObject)
     {
-        if (!(representedObject instanceof WI.Resource) && !(representedObject instanceof WI.Script) && !(representedObject instanceof WI.DOMTree))
+        if (representedObject instanceof WI.DOMTree)
+            return true;
+
+        if (!(representedObject instanceof WI.Resource) && !(representedObject instanceof WI.Script))
             return false;