<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[224508] trunk/Source/WebInspectorUI</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/224508">224508</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2017-11-06 13:08:01 -0800 (Mon, 06 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: no way to navigate from Resource tree element to its entry in Network Tab
https://bugs.webkit.org/show_bug.cgi?id=179328
<rdar://problem/35367294>

Reviewed by Brian Burg.

* Localizations/en.lproj/localizedStrings.js:
New reveal in network tab string.

* UserInterface/Base/Main.js:
(WI.isShowingNetworkTab):
Utility to know if the network tab is showing.

* UserInterface/Views/ContextMenuUtilities.js:
(WI.appendContextMenuItemsForSourceCode):
(showResourceWithOptions):
(WI.appendContextMenuItemsForURL):
Generalize context menus for just a URL.

* UserInterface/Views/TabBrowser.js:
(WI.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
Support more tab ignore options, this is starting to get icky. We may want to
move to just a preferredTab approach, since that is what some of these want.

* UserInterface/Views/DOMTreeElement.js:
(WI.DOMTreeElement.prototype._populateTagContextMenu):
Make use of new ContextMenu utility to add menu items for a URL.

* UserInterface/Views/NetworkTabContentView.js:
(WI.NetworkTabContentView.prototype.showRepresentedObject):
* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView.prototype.showRepresentedObject):
Handle showing a Resource in the NetworkTab. We immediately show
the details view for it, otherwise we fallback to the list view.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContextMenuUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTableContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/ChangeLog       2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2017-11-06  Joseph Pecoraro  <pecoraro@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: no way to navigate from Resource tree element to its entry in Network Tab
+        https://bugs.webkit.org/show_bug.cgi?id=179328
+        <rdar://problem/35367294>
+
+        Reviewed by Brian Burg.
+
+        * Localizations/en.lproj/localizedStrings.js:
+        New reveal in network tab string.
+
+        * UserInterface/Base/Main.js:
+        (WI.isShowingNetworkTab):
+        Utility to know if the network tab is showing.
+
+        * UserInterface/Views/ContextMenuUtilities.js:
+        (WI.appendContextMenuItemsForSourceCode):
+        (showResourceWithOptions):
+        (WI.appendContextMenuItemsForURL):
+        Generalize context menus for just a URL.
+
+        * UserInterface/Views/TabBrowser.js:
+        (WI.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
+        Support more tab ignore options, this is starting to get icky. We may want to
+        move to just a preferredTab approach, since that is what some of these want.
+
+        * UserInterface/Views/DOMTreeElement.js:
+        (WI.DOMTreeElement.prototype._populateTagContextMenu):
+        Make use of new ContextMenu utility to add menu items for a URL.
+
+        * UserInterface/Views/NetworkTabContentView.js:
+        (WI.NetworkTabContentView.prototype.showRepresentedObject):
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype.showRepresentedObject):
+        Handle showing a Resource in the NetworkTab. We immediately show
+        the details view for it, otherwise we fallback to the list view.
+
+2017-11-06  Joseph Pecoraro  <pecoraro@apple.com>
+
</ins><span class="cx">         Uncaught Exception: TypeError: null is not an object (evaluating 'mimeType.endsWith')
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=179325
</span><span class="cx">         <rdar://problem/35366896>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js   2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js      2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -779,6 +779,7 @@
</span><span class="cx"> localizedStrings["Reveal in DOM Tree"] = "Reveal in DOM Tree";
</span><span class="cx"> localizedStrings["Reveal in Debugger Tab"] = "Reveal in Debugger Tab";
</span><span class="cx"> localizedStrings["Reveal in Elements Tab"] = "Reveal in Elements Tab";
</span><ins>+localizedStrings["Reveal in Network Tab"] = "Reveal in Network Tab";
</ins><span class="cx"> localizedStrings["Reveal in Original Resource"] = "Reveal in Original Resource";
</span><span class="cx"> localizedStrings["Reveal in Resources Tab"] = "Reveal in Resources Tab";
</span><span class="cx"> localizedStrings["Right"] = "Right";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js   2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js      2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -993,6 +993,11 @@
</span><span class="cx">     this.tabBrowser.showTabForContentView(tabContentView);
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+WI.isShowingNetworkTab = function()
+{
+    return this.tabBrowser.selectedTabContentView instanceof WI.NetworkTabContentView;
+};
+
</ins><span class="cx"> WI.showTimelineTab = function()
</span><span class="cx"> {
</span><span class="cx">     var tabContentView = this.tabBrowser.bestTabContentViewForClass(WI.TimelineTabContentView);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContextMenuUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js  2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js     2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -42,27 +42,8 @@
</span><span class="cx"> 
</span><span class="cx">     contextMenu.appendSeparator();
</span><span class="cx"> 
</span><del>-    if (sourceCode.url) {
-        contextMenu.appendItem(WI.UIString("Open in New Tab"), () => {
-            const frame = null;
-            WI.openURL(sourceCode.url, frame, {alwaysOpenExternally: true});
-        });
</del><ins>+    WI.appendContextMenuItemsForURL(contextMenu, sourceCode.url, {sourceCode, location});
</ins><span class="cx"> 
</span><del>-        if (WI.frameResourceManager.resourceForURL(sourceCode.url) && !WI.isShowingResourcesTab()) {
-            contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
-                const options = {ignoreNetworkTab: true};
-                if (location)
-                    WI.showSourceCodeLocation(location, options);
-                else
-                    WI.showSourceCode(sourceCode, options);
-            });
-        }
-
-        contextMenu.appendItem(WI.UIString("Copy Link Address"), () => {
-            InspectorFrontendHost.copyText(sourceCode.url);
-        });
-    }
-
</del><span class="cx">     if (sourceCode instanceof WI.Resource) {
</span><span class="cx">         if (sourceCode.urlComponents.scheme !== "data") {
</span><span class="cx">             contextMenu.appendItem(WI.UIString("Copy as cURL"), () => {
</span><span class="lines">@@ -99,6 +80,44 @@
</span><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+WI.appendContextMenuItemsForURL = function(contextMenu, url, options)
+{
+    if (!url)
+        return;
+
+    let {sourceCode, location, frame} = options;
+    function showResourceWithOptions(options) {
+        if (location)
+            WI.showSourceCodeLocation(location, options);
+        else if (sourceCode)
+            WI.showSourceCode(sourceCode, options);
+        else
+            WI.openURL(url, frame, options);
+    }
+
+    contextMenu.appendItem(WI.UIString("Open in New Tab"), () => {
+        const frame = null;
+        WI.openURL(url, frame, {alwaysOpenExternally: true});
+    });
+
+    if (WI.frameResourceManager.resourceForURL(url)) {
+        if (!WI.isShowingResourcesTab()) {
+            contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
+                showResourceWithOptions({ignoreNetworkTab: true, ignoreSearchTab: true});
+            });
+        }
+        if (!WI.isShowingNetworkTab()) {
+            contextMenu.appendItem(WI.UIString("Reveal in Network Tab"), () => {
+                showResourceWithOptions({ignoreResourcesTab: true, ignoreDebuggerTab: true, ignoreSearchTab: true});
+            });
+        }
+    }
+
+    contextMenu.appendItem(WI.UIString("Copy Link Address"), () => {
+        InspectorFrontendHost.copyText(sourceCode.url);
+    });
+};
+
</ins><span class="cx"> WI.appendContextMenuItemsForDOMNode = function(contextMenu, domNode, options = {})
</span><span class="cx"> {
</span><span class="cx">     console.assert(contextMenu instanceof WI.ContextMenu);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js        2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js   2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -739,27 +739,8 @@
</span><span class="cx"> 
</span><span class="cx">         if (event.target && event.target.tagName === "A") {
</span><span class="cx">             let url = event.target.href;
</span><del>-
-            contextMenu.appendItem(WI.UIString("Open in New Tab"), () => {
-                const frame = null;
-                WI.openURL(url, frame, {alwaysOpenExternally: true});
-            });
-
-            if (WI.frameResourceManager.resourceForURL(url)) {
-                contextMenu.appendItem(WI.UIString("Reveal in Resources Tab"), () => {
-                    let frame = WI.frameResourceManager.frameForIdentifier(node.frameIdentifier);
-
-                    const options = {
-                        ignoreNetworkTab: true,
-                        ignoreSearchTab: true,
-                    };
-                    WI.openURL(url, frame, options);
-                });
-            }
-
-            contextMenu.appendItem(WI.UIString("Copy Link Address"), () => {
-                InspectorFrontendHost.copyText(url);
-            });
</del><ins>+            let frame = WI.frameResourceManager.frameForIdentifier(node.frameIdentifier);
+            WI.appendContextMenuItemsForURL(contextMenu, url, {frame});
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         contextMenu.appendSeparator();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js 2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js    2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -98,6 +98,12 @@
</span><span class="cx">         return representedObject instanceof WI.Resource;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    showRepresentedObject(representedObject, cookie)
+    {
+        console.assert(this._contentBrowser.currentContentView === this._networkTableContentView);
+        this._networkTableContentView.showRepresentedObject(representedObject, cookie);
+    }
+
</ins><span class="cx">     get supportsSplitContentBrowser()
</span><span class="cx">     {
</span><span class="cx">         return true;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTableContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js       2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js  2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -256,6 +256,21 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    showRepresentedObject(representedObject, cookie)
+    {
+        console.assert(representedObject instanceof WI.Resource);
+
+        let rowIndex = this._rowIndexForResource(representedObject);
+        if (rowIndex === -1) {
+            this._selectedResource = null;
+            this._table.clearSelectedRow();
+            this._hideResourceDetailView();
+            return;
+        }
+   
+        this._table.selectRow(rowIndex);
+    }
+
</ins><span class="cx">     // NetworkResourceDetailView delegate
</span><span class="cx"> 
</span><span class="cx">     networkResourceDetailViewClose(resourceDetailView)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (224507 => 224508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js    2017-11-06 20:32:06 UTC (rev 224507)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js       2017-11-06 21:08:01 UTC (rev 224508)
</span><span class="lines">@@ -129,6 +129,12 @@
</span><span class="cx">             if (options.ignoreNetworkTab && tabContentView instanceof WI.NetworkTabContentView)
</span><span class="cx">                 continue;
</span><span class="cx"> 
</span><ins>+            if (options.ignoreResourcesTab && tabContentView instanceof WI.ResourcesTabContentView)
+                continue;
+
+            if (options.ignoreDebuggerTab && tabContentView instanceof WI.DebuggerTabContentView)
+                continue;
+
</ins><span class="cx">             if (tabContentView.canShowRepresentedObject(representedObject))
</span><span class="cx">                 return tabContentView;
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>