<!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>[205930] 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/205930">205930</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-09-14 14:15:59 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Call Stack tree in the Debugger sidebar should mark the active call frame
https://bugs.webkit.org/show_bug.cgi?id=161945
<rdar://problem/28293451>
Reviewed by Joseph Pecoraro.
Add an indicator for the active call frame tree element, patterned after
Xcode's call stack UI. The indicator should be positioned on the left,
with a fill color based on the tree element's selected/focused state.
* UserInterface/Images/ActiveCallFrame.svg: Added.
Image for "active call frame" tree element status.
* UserInterface/Main.html:
New file.
* UserInterface/Views/CallFrameTreeElement.css: Added.
(.tree-outline .item.call-frame .status):
(.tree-outline .item.call-frame .status > .status-image):
(.tree-outline .item.call-frame.selected .status > .status-image):
(.tree-outline:matches(:focus, .force-focus) .item.call-frame.selected .status > .status-image):
New tree element styles.
* UserInterface/Views/CallFrameTreeElement.js:
(WebInspector.CallFrameTreeElement):
(WebInspector.CallFrameTreeElement.prototype.get callFrame):
(WebInspector.CallFrameTreeElement.prototype.get isActiveCallFrame):
(WebInspector.CallFrameTreeElement.prototype.set isActiveCallFrame):
Add property for toggling active call frame indicator.
(WebInspector.CallFrameTreeElement.prototype.onattach):
(WebInspector.CallFrameTreeElement.prototype._updateStatus):
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel):
(WebInspector.DebuggerSidebarPanel.prototype._debuggerCallFramesDidChange):
(WebInspector.DebuggerSidebarPanel.prototype._debuggerActiveCallFrameDidChange):
* UserInterface/Views/Variables.css:
(:root):
New global for dark border color.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVariablescss">trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesActiveCallFramesvg">trunk/Source/WebInspectorUI/UserInterface/Images/ActiveCallFrame.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementcss">trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (205929 => 205930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-14 20:57:41 UTC (rev 205929)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-14 21:15:59 UTC (rev 205930)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2016-09-14 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Call Stack tree in the Debugger sidebar should mark the active call frame
+ https://bugs.webkit.org/show_bug.cgi?id=161945
+ <rdar://problem/28293451>
+
+ Reviewed by Joseph Pecoraro.
+
+ Add an indicator for the active call frame tree element, patterned after
+ Xcode's call stack UI. The indicator should be positioned on the left,
+ with a fill color based on the tree element's selected/focused state.
+
+ * UserInterface/Images/ActiveCallFrame.svg: Added.
+ Image for "active call frame" tree element status.
+
+ * UserInterface/Main.html:
+ New file.
+
+ * UserInterface/Views/CallFrameTreeElement.css: Added.
+ (.tree-outline .item.call-frame .status):
+ (.tree-outline .item.call-frame .status > .status-image):
+ (.tree-outline .item.call-frame.selected .status > .status-image):
+ (.tree-outline:matches(:focus, .force-focus) .item.call-frame.selected .status > .status-image):
+ New tree element styles.
+
+ * UserInterface/Views/CallFrameTreeElement.js:
+ (WebInspector.CallFrameTreeElement):
+ (WebInspector.CallFrameTreeElement.prototype.get callFrame):
+ (WebInspector.CallFrameTreeElement.prototype.get isActiveCallFrame):
+ (WebInspector.CallFrameTreeElement.prototype.set isActiveCallFrame):
+ Add property for toggling active call frame indicator.
+ (WebInspector.CallFrameTreeElement.prototype.onattach):
+ (WebInspector.CallFrameTreeElement.prototype._updateStatus):
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel):
+ (WebInspector.DebuggerSidebarPanel.prototype._debuggerCallFramesDidChange):
+ (WebInspector.DebuggerSidebarPanel.prototype._debuggerActiveCallFrameDidChange):
+
+ * UserInterface/Views/Variables.css:
+ (:root):
+ New global for dark border color.
+
</ins><span class="cx"> 2016-09-13 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Use Array.shallowEqual instead of Object.shallowEqual in more places
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesActiveCallFramesvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/ActiveCallFrame.svg (0 => 205930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/ActiveCallFrame.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/ActiveCallFrame.svg 2016-09-14 21:15:59 UTC (rev 205930)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <path d="M 4 15.5 L 0.5 15.5 L 0.5 0.5 L 4 0.5 L 7 7.5 Z"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (205929 => 205930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2016-09-14 20:57:41 UTC (rev 205929)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2016-09-14 21:15:59 UTC (rev 205930)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> <link rel="stylesheet" href="Views/CSSStyleDeclarationTextEditor.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/CSSStyleDetailsSidebarPanel.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/CallFrameIcons.css">
</span><ins>+ <link rel="stylesheet" href="Views/CallFrameTreeElement.css">
</ins><span class="cx"> <link rel="stylesheet" href="Views/CallFrameView.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/ChartDetailsSectionRow.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/CircleChart.css">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementcss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css (0 => 205930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css 2016-09-14 21:15:59 UTC (rev 205930)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+.tree-outline .item.call-frame .status {
+ position: absolute;
+ float: none;
+ left: 1px;
+ margin: 0;
+}
+
+.tree-outline .item.call-frame .status > .status-image {
+ width: 17px;
+ height: 17px;
+ fill: var(--border-color);
+}
+
+.tree-outline .item.call-frame.selected .status > .status-image {
+ fill: var(--border-color-dark);
+}
+
+.tree-outline:matches(:focus, .force-focus) .item.call-frame.selected .status > .status-image {
+ fill: var(--selected-foreground-color);
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js (205929 => 205930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js 2016-09-14 20:57:41 UTC (rev 205929)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.js 2016-09-14 21:15:59 UTC (rev 205930)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> let className = WebInspector.CallFrameView.iconClassNameForCallFrame(callFrame);
</span><span class="cx"> let title = callFrame.functionName || WebInspector.UIString("(anonymous function)");
</span><span class="cx">
</span><del>- super(className, title, null, callFrame, false);
</del><ins>+ super(["call-frame", className], title, null, callFrame, false);
</ins><span class="cx">
</span><span class="cx"> if (!callFrame.nativeCode && callFrame.sourceCodeLocation) {
</span><span class="cx"> let displayScriptURL = callFrame.sourceCodeLocation.displaySourceCode.url;
</span><span class="lines">@@ -45,13 +45,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._callFrame = callFrame;
</span><ins>+ this._isActiveCallFrame = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><del>- get callFrame()
</del><ins>+ get callFrame() { return this._callFrame; }
+ get isActiveCallFrame() { return this._isActiveCallFrame; }
+
+ set isActiveCallFrame(x)
</ins><span class="cx"> {
</span><del>- return this._callFrame;
</del><ins>+ if (this._isActiveCallFrame === x)
+ return;
+
+ this._isActiveCallFrame = x;
+ this._updateStatus();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Protected
</span><span class="lines">@@ -69,5 +77,24 @@
</span><span class="cx"> let tooltipPrefix = this.mainTitle + tailCallSuffix + "\n";
</span><span class="cx"> this._callFrame.sourceCodeLocation.populateLiveDisplayLocationTooltip(this.element, tooltipPrefix);
</span><span class="cx"> }
</span><ins>+
+ this._updateStatus();
</ins><span class="cx"> }
</span><ins>+
+ // Private
+
+ _updateStatus()
+ {
+ if (!this.element)
+ return;
+
+ if (!this._isActiveCallFrame) {
+ this.status = null;
+ return;
+ }
+
+ if (!this._statusImageElement)
+ this._statusImageElement = useSVGSymbol("Images/ActiveCallFrame.svg", "status-image");
+ this.status = this._statusImageElement;
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (205929 => 205930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-09-14 20:57:41 UTC (rev 205929)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-09-14 21:15:59 UTC (rev 205930)
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx">
</span><span class="cx"> this._callStackContentTreeOutline = this.createContentTreeOutline(true, true);
</span><span class="cx"> this._callStackContentTreeOutline.addEventListener(WebInspector.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
</span><ins>+ this._activeCallFrameTreeElement = null;
</ins><span class="cx">
</span><span class="cx"> this._callStackRow = new WebInspector.DetailsSectionRow(WebInspector.UIString("No Call Frames"));
</span><span class="cx"> this._callStackRow.showEmptyMessage();
</span><span class="lines">@@ -598,6 +599,7 @@
</span><span class="cx"> _debuggerCallFramesDidChange()
</span><span class="cx"> {
</span><span class="cx"> this._callStackContentTreeOutline.removeChildren();
</span><ins>+ this._activeCallFrameTreeElement = null;
</ins><span class="cx">
</span><span class="cx"> var callFrames = WebInspector.debuggerManager.callFrames;
</span><span class="cx"> if (!callFrames || !callFrames.length) {
</span><span class="lines">@@ -608,18 +610,18 @@
</span><span class="cx"> this._callStackRow.hideEmptyMessage();
</span><span class="cx"> this._callStackRow.element.appendChild(this._callStackContentTreeOutline.element);
</span><span class="cx">
</span><del>- var treeElementToSelect = null;
-
</del><span class="cx"> var activeCallFrame = WebInspector.debuggerManager.activeCallFrame;
</span><span class="cx"> for (var i = 0; i < callFrames.length; ++i) {
</span><span class="cx"> var callFrameTreeElement = new WebInspector.CallFrameTreeElement(callFrames[i]);
</span><span class="cx"> if (callFrames[i] === activeCallFrame)
</span><del>- treeElementToSelect = callFrameTreeElement;
</del><ins>+ this._activeCallFrameTreeElement = callFrameTreeElement;
</ins><span class="cx"> this._callStackContentTreeOutline.appendChild(callFrameTreeElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (treeElementToSelect)
- treeElementToSelect.select(true, true);
</del><ins>+ if (this._activeCallFrameTreeElement) {
+ this._activeCallFrameTreeElement.select(true, true);
+ this._activeCallFrameTreeElement.isActiveCallFrame = true;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _debuggerActiveCallFrameDidChange()
</span><span class="lines">@@ -628,6 +630,13 @@
</span><span class="cx"> if (!callFrames)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (this._activeCallFrameTreeElement)
+ this._activeCallFrameTreeElement.isActiveCallFrame = false;
+
+ this._activeCallFrameTreeElement = this._callStackContentTreeOutline.findTreeElement(WebInspector.debuggerManager.activeCallFrame);
+ if (this._activeCallFrameTreeElement)
+ this._activeCallFrameTreeElement.isActiveCallFrame = true;
+
</ins><span class="cx"> var indexOfActiveCallFrame = callFrames.indexOf(WebInspector.debuggerManager.activeCallFrame);
</span><span class="cx"> // It is useful to turn off the step out button when there is no call frame to go through
</span><span class="cx"> // since there might be call frames in the backend that were removed when processing the call
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVariablescss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css (205929 => 205930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-09-14 20:57:41 UTC (rev 205929)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-09-14 21:15:59 UTC (rev 205930)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> --glyph-color-active-pressed: hsl(218, 85%, 52%);
</span><span class="cx">
</span><span class="cx"> --border-color: hsl(0, 0%, 70%);
</span><ins>+ --border-color-dark: hsl(0, 0%, 57%);
</ins><span class="cx"> --panel-background-color: hsl(0, 0%, 94%);
</span><span class="cx"> --panel-background-color-light: hsl(0, 0%, 96%);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>