<!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>[205946] 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/205946">205946</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-09-14 21:54:37 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Call frame is sometimes not selected in Debugger sidebar on initial pause
https://bugs.webkit.org/show_bug.cgi?id=161835
<rdar://problem/28236680>
Reviewed by Joseph Pecoraro.
* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel):
(WebInspector.NavigationSidebarPanel.prototype._contentTreeOutlineTreeSelectionDidChange):
If a tree other than the newly selected element's tree has the selection,
deselect it to prevent multiple tree selections.
(WebInspector.NavigationSidebarPanel.prototype.show): Deleted.
Not needed since the selected tree is no longer tracked. Incidentally,
SidebarPanel.show was only called by SearchSidebarPanel, which doesn't need
to manage selection across multiple tree outlines.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</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 (205945 => 205946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-15 04:32:20 UTC (rev 205945)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-15 04:54:37 UTC (rev 205946)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-09-14 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Call frame is sometimes not selected in Debugger sidebar on initial pause
+ https://bugs.webkit.org/show_bug.cgi?id=161835
+ <rdar://problem/28236680>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel):
+ (WebInspector.NavigationSidebarPanel.prototype._contentTreeOutlineTreeSelectionDidChange):
+ If a tree other than the newly selected element's tree has the selection,
+ deselect it to prevent multiple tree selections.
+ (WebInspector.NavigationSidebarPanel.prototype.show): Deleted.
+ Not needed since the selected tree is no longer tracked. Incidentally,
+ SidebarPanel.show was only called by SearchSidebarPanel, which doesn't need
+ to manage selection across multiple tree outlines.
+
+2016-09-14 Matt Baker <mattbaker@apple.com>
+
</ins><span class="cx"> Web Inspector: Call Stack tree in the Debugger sidebar should mark the active call frame
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161945
</span><span class="cx"> <rdar://problem/28293451>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (205945 => 205946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2016-09-15 04:32:20 UTC (rev 205945)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2016-09-15 04:54:37 UTC (rev 205946)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> this.contentView.element.addEventListener("scroll", this.soon._updateContentOverflowShadowVisibility);
</span><span class="cx">
</span><span class="cx"> this._contentTreeOutline = this.createContentTreeOutline(true);
</span><del>- this._selectedContentTreeOutline = null;
</del><span class="cx">
</span><span class="cx"> this._filterBar = new WebInspector.FilterBar;
</span><span class="cx"> this._filterBar.addEventListener(WebInspector.FilterBar.Event.FilterDidChange, this._filterDidChange, this);
</span><span class="lines">@@ -440,21 +439,6 @@
</span><span class="cx"> treeElement.hidden = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- show()
- {
- if (!this.parentSidebar)
- return;
-
- super.show();
-
- let treeOutline = this._selectedContentTreeOutline;
- if (!treeOutline && this._visibleContentTreeOutlines.length)
- treeOutline = this._visibleContentTreeOutlines[0];
-
- if (treeOutline)
- treeOutline.element.focus();
- }
-
</del><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="cx"> super.shown();
</span><span class="lines">@@ -678,15 +662,17 @@
</span><span class="cx"> if (!selectedElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Prevent two selections in the sidebar, if the selected tree outline is changing.
- let treeOutline = selectedElement.treeOutline;
- if (this._selectedContentTreeOutline && this._selectedContentTreeOutline !== treeOutline) {
- if (this._selectedContentTreeOutline.selectedTreeElement)
- this._selectedContentTreeOutline.selectedTreeElement.deselect();
</del><ins>+ // Prevent two selections in the sidebar.
+ let selectedTreeOutline = selectedElement.treeOutline;
+ for (let treeOutline of this._visibleContentTreeOutlines) {
+ if (selectedTreeOutline === treeOutline)
+ continue;
+
+ if (treeOutline.selectedTreeElement) {
+ treeOutline.selectedTreeElement.deselect();
+ break;
+ }
</ins><span class="cx"> }
</span><del>-
- treeOutline[WebInspector.NavigationSidebarPanel.PreviousSelectedTreeElementSymbol] = null;
- this._selectedContentTreeOutline = treeOutline;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _checkForStaleResourcesIfNeeded()
</span></span></pre>
</div>
</div>
</body>
</html>