<!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>[168484] 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/168484">168484</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-08 12:40:24 -0700 (Thu, 08 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Selecting frame in debugger sidebar doesn't reveal code
https://bugs.webkit.org/show_bug.cgi?id=132112
Patch by Jono Wells <jonowells@apple.com> on 2014-05-08
Reviewed by Joseph Pecoraro.
WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar was checking
only one of the two content trees in the DebuggerSidebarPanel instance. Added
base getter elementIsSelected to NavigationSidebarPanel and extended it in
DebuggerSidebarPanel.
* UserInterface/Base/Main.js:
(WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar): modified logic to check `selectedSidebarPanel.elementIsSelected`.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype.get elementIsSelected): Checks breakpoint and call stack trees.
* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel.prototype.get elementIsSelected): Base implementation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</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 (168483 => 168484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-05-08 19:19:50 UTC (rev 168483)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-05-08 19:40:24 UTC (rev 168484)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-08 Jono Wells <jonowells@apple.com>
+
+ Web Inspector: Selecting frame in debugger sidebar doesn't reveal code
+ https://bugs.webkit.org/show_bug.cgi?id=132112
+
+ Reviewed by Joseph Pecoraro.
+
+ WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar was checking
+ only one of the two content trees in the DebuggerSidebarPanel instance. Added
+ base getter elementIsSelected to NavigationSidebarPanel and extended it in
+ DebuggerSidebarPanel.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector._revealAndSelectRepresentedObjectInNavigationSidebar): modified logic to check `selectedSidebarPanel.elementIsSelected`.
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype.get elementIsSelected): Checks breakpoint and call stack trees.
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.get elementIsSelected): Base implementation.
+
</ins><span class="cx"> 2014-05-06 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: [CSS Regions] Add the regionOversetChange event to the iOS 7.0 WebInspector UI
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (168483 => 168484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-05-08 19:19:50 UTC (rev 168483)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-05-08 19:40:24 UTC (rev 168484)
</span><span class="lines">@@ -916,12 +916,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var treeElement = selectedSidebarPanel.treeElementForRepresentedObject(representedObject);
</span><ins>+
</ins><span class="cx"> if (treeElement)
</span><span class="cx"> treeElement.revealAndSelect(true, false, true, true);
</span><span class="cx"> else if (selectedSidebarPanel.contentTreeOutline.selectedTreeElement)
</span><span class="cx"> selectedSidebarPanel.contentTreeOutline.selectedTreeElement.deselect(true);
</span><span class="cx">
</span><del>- if (!selectedSidebarPanel.contentTreeOutline.selectedTreeElement)
</del><ins>+ if (!selectedSidebarPanel.hasSelectedElement)
</ins><span class="cx"> selectedSidebarPanel.showDefaultContentView();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1826,7 +1827,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (typeof listener.handleKeydownEvent !== "function")
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> this._windowKeydownListeners.push(listener);
</span><span class="cx">
</span><span class="cx"> this._updateWindowKeydownListener();
</span><span class="lines">@@ -1835,7 +1836,7 @@
</span><span class="cx"> WebInspector.removeWindowKeydownListener = function(listener)
</span><span class="cx"> {
</span><span class="cx"> this._windowKeydownListeners.remove(listener);
</span><del>-
</del><ins>+
</ins><span class="cx"> this._updateWindowKeydownListener();
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (168483 => 168484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2014-05-08 19:19:50 UTC (rev 168483)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2014-05-08 19:40:24 UTC (rev 168484)
</span><span class="lines">@@ -129,6 +129,11 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><ins>+ get hasSelectedElement()
+ {
+ return !!this._breakpointsContentTreeOutline.selectedTreeElement || !!this._callStackContentTreeOutline.selectedTreeElement;
+ },
+
</ins><span class="cx"> showDefaultContentView: function()
</span><span class="cx"> {
</span><span class="cx"> WebInspector.resourceSidebarPanel.showDefaultContentView();
</span><span class="lines">@@ -211,7 +216,7 @@
</span><span class="cx"> this._debuggerPauseResumeButtonItem.enabled = true;
</span><span class="cx"> this._debuggerPauseResumeButtonItem.toggled = true;
</span><span class="cx"> this._debuggerStepOverButtonItem.enabled = true;
</span><del>- this._debuggerStepIntoButtonItem.enabled = true;
</del><ins>+ this._debuggerStepIntoButtonItem.enabled = true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _debuggerDidResume: function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (168483 => 168484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-05-08 19:19:50 UTC (rev 168483)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2014-05-08 19:40:24 UTC (rev 168484)
</span><span class="lines">@@ -147,6 +147,11 @@
</span><span class="cx"> return this._contentTreeOutline;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get hasSelectedElement()
+ {
+ return !!this._contentTreeOutline.selectedTreeElement;
+ },
+
</ins><span class="cx"> get filterBar()
</span><span class="cx"> {
</span><span class="cx"> return this._filterBar;
</span></span></pre>
</div>
</div>
</body>
</html>