<!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>[201210] 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/201210">201210</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-19 23:31:47 -0700 (Thu, 19 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Main Resource with <scripts> not showing up in debugger sidebar after reload
https://bugs.webkit.org/show_bug.cgi?id=157939
<rdar://problem/26385691>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-19
Reviewed by Timothy Hatcher.
The order of events on a reload are:
- MainResourceChanged, add main resource
- ScriptsCleared, remove all elements
This change makes it so ScriptsCleared add the main resource (and
potentially other resources). This also avoids the work in
MainResourceChanged on reloads / navigations that would be wasted if
ScriptsCleared were to just remove it. However, this is still needed
for initial load where ScriptsCleared does not happen.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype._mainResourceDidChange):
Only add the main resource tree here when we are first loading.
(WebInspector.DebuggerSidebarPanel.prototype._scriptsCleared):
Add the main resource tree after we remove all children in navigations.
* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel.prototype._contentTreeOutlineTreeSelectionDidChange):
This was not gracefully handling if there was no selected tree element.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (201209 => 201210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-20 04:13:33 UTC (rev 201209)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-20 06:31:47 UTC (rev 201210)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2016-05-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Main Resource with <scripts> not showing up in debugger sidebar after reload
+ https://bugs.webkit.org/show_bug.cgi?id=157939
+ <rdar://problem/26385691>
+
+ Reviewed by Timothy Hatcher.
+
+ The order of events on a reload are:
+
+ - MainResourceChanged, add main resource
+ - ScriptsCleared, remove all elements
+
+ This change makes it so ScriptsCleared add the main resource (and
+ potentially other resources). This also avoids the work in
+ MainResourceChanged on reloads / navigations that would be wasted if
+ ScriptsCleared were to just remove it. However, this is still needed
+ for initial load where ScriptsCleared does not happen.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype._mainResourceDidChange):
+ Only add the main resource tree here when we are first loading.
+
+ (WebInspector.DebuggerSidebarPanel.prototype._scriptsCleared):
+ Add the main resource tree after we remove all children in navigations.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype._contentTreeOutlineTreeSelectionDidChange):
+ This was not gracefully handling if there was no selected tree element.
+
+2016-05-19 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Visual Style connectors are not always centered properly
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157932
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (201209 => 201210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-20 04:13:33 UTC (rev 201209)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-20 06:31:47 UTC (rev 201210)
</span><span class="lines">@@ -423,10 +423,12 @@
</span><span class="cx"> this.contentBrowser.contentViewContainer.closeAllContentViews();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var resource = event.target.mainResource;
- this._addTreeElementForSourceCodeToTreeOutline(resource, this._scriptsContentTreeOutline);
- this._addBreakpointsForSourceCode(resource);
- this._addIssuesForSourceCode(resource);
</del><ins>+ if (!event.data.oldMainResource) {
+ var resource = event.target.mainResource;
+ this._addTreeElementForSourceCodeToTreeOutline(resource, this._scriptsContentTreeOutline);
+ this._addBreakpointsForSourceCode(resource);
+ this._addIssuesForSourceCode(resource);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _timelineCapturingWillStart(event)
</span><span class="lines">@@ -500,6 +502,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._scriptsContentTreeOutline.removeChildren();
</span><ins>+
+ this._addResourcesRecursivelyForFrame(WebInspector.frameResourceManager.mainFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _breakpointAdded(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (201209 => 201210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2016-05-20 04:13:33 UTC (rev 201209)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2016-05-20 06:31:47 UTC (rev 201210)
</span><span class="lines">@@ -674,8 +674,10 @@
</span><span class="cx">
</span><span class="cx"> // Prevent two selections in the sidebar, if the selected tree outline is changing.
</span><span class="cx"> let treeOutline = selectedElement.treeOutline;
</span><del>- if (this._selectedContentTreeOutline && this._selectedContentTreeOutline !== treeOutline)
- this._selectedContentTreeOutline.selectedTreeElement.deselect();
</del><ins>+ if (this._selectedContentTreeOutline && this._selectedContentTreeOutline !== treeOutline) {
+ if (this._selectedContentTreeOutline.selectedTreeElement)
+ this._selectedContentTreeOutline.selectedTreeElement.deselect();
+ }
</ins><span class="cx">
</span><span class="cx"> treeOutline[WebInspector.NavigationSidebarPanel.PreviousSelectedTreeElementSymbol] = null;
</span><span class="cx"> this._selectedContentTreeOutline = treeOutline;
</span></span></pre>
</div>
</div>
</body>
</html>