Changeset 243403 in webkit

Timestamp:

Mar 22, 2019 3:19:38 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Sources: "Reveal in Resources Tab" still shown when Sources tab is enabled
​https://bugs.webkit.org/show_bug.cgi?id=196134

Reviewed by Joseph Pecoraro.

• UserInterface/Views/RecordingActionTreeElement.js:

(WI.RecordingActionTreeElement.prototype.populateContextMenu):
Drive-by: find the first call frame that has a source code location, rather than naively
always using the top call frame.

• UserInterface/Views/SearchResultTreeElement.js:

(WI.SearchResultTreeElement.prototype.populateContextMenu):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/RecordingActionTreeElement.js (modified) (1 diff)
• UserInterface/Views/SearchResultTreeElement.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-03-22  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Sources: "Reveal in Resources Tab" still shown when Sources tab is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=196134
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/RecordingActionTreeElement.js:
+        (WI.RecordingActionTreeElement.prototype.populateContextMenu):
+        Drive-by: find the first call frame that has a source code location, rather than naively
+        always using the top call frame.
+
+        * UserInterface/Views/SearchResultTreeElement.js:
+        (WI.SearchResultTreeElement.prototype.populateContextMenu):
+
 2019-03-22  Keith Rollin  <krollin@apple.com>
 

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

@@ -429 +429 @@
         contextMenu.appendSeparator();
 
-        let callFrame = this.representedObject.trace[0];
-        if (callFrame) {
-            contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
-                WI.showSourceCodeLocation(callFrame.sourceCodeLocation, {
+        let sourceCodeLocation = null;
+        for (let callFrame of this.representedObject.trace) {
+            if (callFrame.sourceCodeLocation) {
+                sourceCodeLocation = callFrame.sourceCodeLocation;
+                break;
+            }
+        }
+
+        if (sourceCodeLocation) {
+            let label = null;
+            if (WI.settings.experimentalEnableSourcesTab.value)
+                label = WI.UIString("Reveal in Sources Tab");
+            else
+                label = WI.UIString("Reveal in Resources Tab");
+            contextMenu.appendItem(label, () => {
+                WI.showSourceCodeLocation(sourceCodeLocation, {
                     ignoreNetworkTab: true,
                     ignoreSearchTab: true,

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

@@ -100 +100 @@
             });
         } else if (this.representedObject instanceof WI.SourceCodeSearchMatchObject) {
-            contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
+            let label = null;
+            if (WI.settings.experimentalEnableSourcesTab.value)
+                label = WI.UIString("Reveal in Sources Tab");
+            else
+                label = WI.UIString("Reveal in Resources Tab");
+            contextMenu.appendItem(label, () => {
                 WI.showOriginalOrFormattedSourceCodeTextRange(this.representedObject.sourceCodeTextRange, {
                     ignoreNetworkTab: true,