<!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>[209213] 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/209213">209213</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 14:32:33 -0800 (Thu, 01 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Show async stack traces for workers
https://bugs.webkit.org/show_bug.cgi?id=165235
&lt;rdar://problem/29450172&gt;

Reviewed by Joseph Pecoraro.

* UserInterface/Views/CallFrameTreeElement.css:
(.tree-outline &gt; .children &gt; .item.call-frame.async-boundary):
(.tree-outline:not(.single-thread) &gt; .children &gt; .item.call-frame.async-boundary):
(.tree-outline .item.call-frame.async-boundary::before):
(.tree-outline.single-thread .item.call-frame.async-boundary::before):
(.tree-outline .item.call-frame.async-boundary): Deleted.
Style changes for single/multiple-thread call stacks.
Padding changes to account for Thread tree element.
Make selectors more specific where needed.

* UserInterface/Views/DebuggerSidebarPanel.css:
(.sidebar &gt; .panel.navigation.debugger .tree-outline.single-thread &gt; .item.thread):
(.sidebar &gt; .panel.navigation.debugger .tree-outline.single-thread):
Style changes for single/multiple-thread call stacks.

* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel):
Use a single tree outline for showing a single thread or multiple threads.
For single-threaded, hide Thread tree element and un-indent children.

(WebInspector.DebuggerSidebarPanel.prototype._targetAdded):
(WebInspector.DebuggerSidebarPanel.prototype._targetRemoved):
(WebInspector.DebuggerSidebarPanel.prototype._updateCallStackTreeOutline):
Update tree style and whether Thread tree element is selectable.
(WebInspector.DebuggerSidebarPanel.prototype._debuggerActiveCallFrameDidChange):
Remove support for second tree outline.

(WebInspector.DebuggerSidebarPanel.prototype._updateSingleThreadCallStacks): Deleted.
(WebInspector.DebuggerSidebarPanel.prototype._selectActiveCallFrameTreeElement): Deleted.
(WebInspector.DebuggerSidebarPanel.prototype._showSingleThreadCallStacks): Deleted.
(WebInspector.DebuggerSidebarPanel.prototype._showMultipleThreadCallStacks): Deleted.
No longer needed after unifying tree outlines.

* UserInterface/Views/ThreadTreeElement.js:
(WebInspector.ThreadTreeElement.prototype.refresh):
Append call frames from the async stack trace.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementcss">trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsThreadTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ThreadTreeElement.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (209212 => 209213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2016-12-01 22:31:01 UTC (rev 209212)
+++ trunk/Source/WebInspectorUI/ChangeLog        2016-12-01 22:32:33 UTC (rev 209213)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-12-01  Matt Baker  &lt;mattbaker@apple.com&gt;
+
+        Web Inspector: Show async stack traces for workers
+        https://bugs.webkit.org/show_bug.cgi?id=165235
+        &lt;rdar://problem/29450172&gt;
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/CallFrameTreeElement.css:
+        (.tree-outline &gt; .children &gt; .item.call-frame.async-boundary):
+        (.tree-outline:not(.single-thread) &gt; .children &gt; .item.call-frame.async-boundary):
+        (.tree-outline .item.call-frame.async-boundary::before):
+        (.tree-outline.single-thread .item.call-frame.async-boundary::before):
+        (.tree-outline .item.call-frame.async-boundary): Deleted.
+        Style changes for single/multiple-thread call stacks.
+        Padding changes to account for Thread tree element.
+        Make selectors more specific where needed.
+
+        * UserInterface/Views/DebuggerSidebarPanel.css:
+        (.sidebar &gt; .panel.navigation.debugger .tree-outline.single-thread &gt; .item.thread):
+        (.sidebar &gt; .panel.navigation.debugger .tree-outline.single-thread):
+        Style changes for single/multiple-thread call stacks.
+
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WebInspector.DebuggerSidebarPanel):
+        Use a single tree outline for showing a single thread or multiple threads.
+        For single-threaded, hide Thread tree element and un-indent children.
+
+        (WebInspector.DebuggerSidebarPanel.prototype._targetAdded):
+        (WebInspector.DebuggerSidebarPanel.prototype._targetRemoved):
+        (WebInspector.DebuggerSidebarPanel.prototype._updateCallStackTreeOutline):
+        Update tree style and whether Thread tree element is selectable.
+        (WebInspector.DebuggerSidebarPanel.prototype._debuggerActiveCallFrameDidChange):
+        Remove support for second tree outline.
+
+        (WebInspector.DebuggerSidebarPanel.prototype._updateSingleThreadCallStacks): Deleted.
+        (WebInspector.DebuggerSidebarPanel.prototype._selectActiveCallFrameTreeElement): Deleted.
+        (WebInspector.DebuggerSidebarPanel.prototype._showSingleThreadCallStacks): Deleted.
+        (WebInspector.DebuggerSidebarPanel.prototype._showMultipleThreadCallStacks): Deleted.
+        No longer needed after unifying tree outlines.
+
+        * UserInterface/Views/ThreadTreeElement.js:
+        (WebInspector.ThreadTreeElement.prototype.refresh):
+        Append call frames from the async stack trace.
+
</ins><span class="cx"> 2016-11-30  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Clicking on link in Web Inspector can cause UIProcess to crash
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCallFrameTreeElementcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css (209212 => 209213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css        2016-12-01 22:31:01 UTC (rev 209212)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameTreeElement.css        2016-12-01 22:32:33 UTC (rev 209213)
</span><span class="lines">@@ -47,9 +47,12 @@
</span><span class="cx"> .tree-outline .item.call-frame.async-boundary {
</span><span class="cx">     cursor: default;
</span><span class="cx">     color: var(--text-color-gray-medium);
</span><del>-    padding-left: 0;
</del><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.tree-outline:not(.single-thread) &gt; .children &gt; .item.call-frame.async-boundary {
+    padding-left: 5px;
+}
+
</ins><span class="cx"> .tree-outline .item.call-frame.async-boundary .icon {
</span><span class="cx">     float: none;
</span><span class="cx">     display: inline-block;
</span><span class="lines">@@ -72,6 +75,11 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .tree-outline .item.call-frame.async-boundary::before {
</span><ins>+    width: 30px;
+    margin-left: -5px;
+    margin-right: 1px;
+}
+
+.tree-outline.single-thread .item.call-frame.async-boundary::before {
</ins><span class="cx">     width: 20px;
</span><del>-    margin-right: 2px;
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css (209212 => 209213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css        2016-12-01 22:31:01 UTC (rev 209212)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css        2016-12-01 22:32:33 UTC (rev 209213)
</span><span class="lines">@@ -54,6 +54,14 @@
</span><span class="cx">     background-color: hsl(50, 100%, 94%);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.sidebar &gt; .panel.navigation.debugger .tree-outline.single-thread &gt; .item.thread {
+    display: none;
+}
+
+.sidebar &gt; .panel.navigation.debugger .tree-outline.single-thread {
+    margin-left: -10px;
+}
+
</ins><span class="cx"> .sidebar &gt; .panel.navigation.debugger .warning-banner &gt; a {
</span><span class="cx">     text-decoration: underline;
</span><span class="cx">     cursor: pointer;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (209212 => 209213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js        2016-12-01 22:31:01 UTC (rev 209212)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js        2016-12-01 22:32:33 UTC (rev 209213)
</span><span class="lines">@@ -177,25 +177,20 @@
</span><span class="cx">         this._callStackTreeOutline = this.createContentTreeOutline(dontHideByDefault, suppressFiltering);
</span><span class="cx">         this._callStackTreeOutline.addEventListener(WebInspector.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
</span><span class="cx"> 
</span><del>-        this._singleThreadCallStackTreeOutline = this.createContentTreeOutline(dontHideByDefault, suppressFiltering);
-        this._singleThreadCallStackTreeOutline.addEventListener(WebInspector.TreeOutline.Event.SelectionDidChange, this._treeSelectionDidChange, this);
</del><ins>+        this._mainTargetTreeElement = new WebInspector.ThreadTreeElement(WebInspector.mainTarget);
+        this._callStackTreeOutline.appendChild(this._mainTargetTreeElement);
</ins><span class="cx"> 
</span><del>-        let mainTargetTreeElement = new WebInspector.ThreadTreeElement(WebInspector.mainTarget);
-        this._callStackTreeOutline.appendChild(mainTargetTreeElement);
</del><ins>+        this._updateCallStackTreeOutline();
</ins><span class="cx"> 
</span><del>-        this._multipleThreadsCallStackRow = new WebInspector.DetailsSectionRow;
-        this._multipleThreadsCallStackRow.element.appendChild(this._callStackTreeOutline.element);
</del><ins>+        this._callStackRow = new WebInspector.DetailsSectionRow;
+        this._callStackRow.element.appendChild(this._callStackTreeOutline.element);
</ins><span class="cx"> 
</span><del>-        this._singleThreadCallStackRow = new WebInspector.DetailsSectionRow;
-        this._singleThreadCallStackRow.element.appendChild(this._singleThreadCallStackTreeOutline.element);
-
-        this._callStackGroup = new WebInspector.DetailsSectionGroup([this._singleThreadCallStackRow]);
</del><ins>+        this._callStackGroup = new WebInspector.DetailsSectionGroup([this._callStackRow]);
</ins><span class="cx">         this._callStackSection = new WebInspector.DetailsSection(&quot;call-stack&quot;, WebInspector.UIString(&quot;Call Stack&quot;), [this._callStackGroup]);
</span><span class="cx"> 
</span><span class="cx">         this._showingSingleThreadCallStack = true;
</span><span class="cx"> 
</span><span class="cx">         this._activeCallFrameTreeElement = null;
</span><del>-        this._singleThreadActiveCallFrameTreeElement = null;
</del><span class="cx"> 
</span><span class="cx">         this._pauseReasonTreeOutline = null;
</span><span class="cx"> 
</span><span class="lines">@@ -601,99 +596,6 @@
</span><span class="cx">         this._removeDebuggerTreeElement(breakpointTreeElement);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    _updateSingleThreadCallStacks()
-    {
-        let targetData = WebInspector.debuggerManager.dataForTarget(WebInspector.mainTarget);
-        let callFrames = targetData.callFrames;
-
-        this._singleThreadCallStackTreeOutline.removeChildren();
-
-        if (!callFrames.length) {
-            this._singleThreadCallStackTreeOutline.appendChild(new WebInspector.IdleTreeElement);
-            return;
-        }
-
-        let activeCallFrame = WebInspector.debuggerManager.activeCallFrame;
-        let activeCallFrameTreeElement = null;
-
-        for (let callFrame of callFrames) {
-            let callFrameTreeElement = new WebInspector.CallFrameTreeElement(callFrame);
-            if (callFrame === activeCallFrame)
-                activeCallFrameTreeElement = callFrameTreeElement;
-            this._singleThreadCallStackTreeOutline.appendChild(callFrameTreeElement);
-        }
-
-        if (activeCallFrameTreeElement) {
-            activeCallFrameTreeElement.isActiveCallFrame = true;
-            if (this._showingSingleThreadCallStack)
-                activeCallFrameTreeElement.select(true, true);
-        }
-
-        if (!targetData.asyncStackTrace)
-            return;
-
-        let currentStackTrace = targetData.asyncStackTrace;
-        while (currentStackTrace) {
-            console.assert(currentStackTrace.callFrames.length, &quot;StackTrace should have non-empty call frames array.&quot;);
-            if (!currentStackTrace.callFrames.length)
-                break;
-
-            let boundaryCallFrame;
-            if (currentStackTrace.topCallFrameIsBoundary) {
-                boundaryCallFrame = currentStackTrace.callFrames[0];
-                console.assert(boundaryCallFrame.nativeCode &amp;&amp; !boundaryCallFrame.sourceCodeLocation);
-            } else {
-                // Create a generic native CallFrame for the asynchronous boundary.
-                const functionName = WebInspector.UIString(&quot;(async)&quot;);
-                const nativeCode = true;
-                boundaryCallFrame = new WebInspector.CallFrame(null, null, null, functionName, null, null, nativeCode);
-            }
-
-            const isAsyncBoundaryCallFrame = true;
-            this._singleThreadCallStackTreeOutline.appendChild(new WebInspector.CallFrameTreeElement(boundaryCallFrame, isAsyncBoundaryCallFrame));
-
-            let startIndex = currentStackTrace.topCallFrameIsBoundary ? 1 : 0;
-            for (let i = startIndex; i &lt; currentStackTrace.callFrames.length; ++i)
-                this._singleThreadCallStackTreeOutline.appendChild(new WebInspector.CallFrameTreeElement(currentStackTrace.callFrames[i]));
-
-            currentStackTrace = currentStackTrace.parentStackTrace;
-        }
-    }
-
-    _selectActiveCallFrameTreeElement(treeOutline)
-    {
-        let activeCallFrame = WebInspector.debuggerManager.activeCallFrame;
-        if (activeCallFrame) {
-            let activeCallFrameTreeElement = treeOutline.findTreeElement(activeCallFrame);
-            if (activeCallFrameTreeElement)
-                activeCallFrameTreeElement.select(true, true);
-        }
-    }
-
-    _showSingleThreadCallStacks()
-    {
-        console.assert(!this._showingSingleThreadCallStack);
-        console.assert(WebInspector.targets.size === 1);
-
-        this._showingSingleThreadCallStack = true;
-
-        this._callStackGroup.rows = [this._singleThreadCallStackRow];
-
-        this._selectActiveCallFrameTreeElement(this._singleThreadCallStackTreeOutline);
-    }
-
-    _showMultipleThreadCallStacks()
-    {
-        console.assert(this._showingSingleThreadCallStack);
-        console.assert(WebInspector.targets.size &gt; 1);
-
-        this._showingSingleThreadCallStack = false;
-
-        this._callStackGroup.rows = [this._multipleThreadsCallStackRow];
-
-        this._selectActiveCallFrameTreeElement(this._callStackTreeOutline);
-    }
-
</del><span class="cx">     _findThreadTreeElementForTarget(target)
</span><span class="cx">     {
</span><span class="cx">         for (let child of this._callStackTreeOutline.children) {
</span><span class="lines">@@ -710,8 +612,7 @@
</span><span class="cx">         let treeElement = new WebInspector.ThreadTreeElement(target);
</span><span class="cx">         this._callStackTreeOutline.appendChild(treeElement);
</span><span class="cx"> 
</span><del>-        if (this._showingSingleThreadCallStack)
-            this._showMultipleThreadCallStacks();
</del><ins>+        this._updateCallStackTreeOutline();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _targetRemoved(event)
</span><span class="lines">@@ -720,10 +621,16 @@
</span><span class="cx">         let treeElement = this._findThreadTreeElementForTarget(target);
</span><span class="cx">         this._callStackTreeOutline.removeChild(treeElement);
</span><span class="cx"> 
</span><del>-        if (WebInspector.targets.size === 1)
-            this._showSingleThreadCallStacks();
</del><ins>+        this._updateCallStackTreeOutline();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    _updateCallStackTreeOutline()
+    {
+        let singleThreadShowing = WebInspector.targets.size === 1;
+        this._callStackTreeOutline.element.classList.toggle(&quot;single-thread&quot;, singleThreadShowing);
+        this._mainTargetTreeElement.selectable = !singleThreadShowing;
+    }
+
</ins><span class="cx">     _handleDebuggerObjectDisplayLocationDidChange(event)
</span><span class="cx">     {
</span><span class="cx">         var debuggerObject = event.target;
</span><span class="lines">@@ -770,9 +677,6 @@
</span><span class="cx">         let target = event.data.target;
</span><span class="cx">         let treeElement = this._findThreadTreeElementForTarget(target);
</span><span class="cx">         treeElement.refresh();
</span><del>-
-        if (target === WebInspector.mainTarget)
-            this._updateSingleThreadCallStacks();
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _debuggerActiveCallFrameDidChange()
</span><span class="lines">@@ -781,10 +685,6 @@
</span><span class="cx">             this._activeCallFrameTreeElement.isActiveCallFrame = false;
</span><span class="cx">             this._activeCallFrameTreeElement = null;
</span><span class="cx">         }
</span><del>-        if (this._singleThreadActiveCallFrameTreeElement) {
-            this._singleThreadActiveCallFrameTreeElement.isActiveCallFrame = false;
-            this._singleThreadActiveCallFrameTreeElement = null;
-        }
</del><span class="cx"> 
</span><span class="cx">         if (!WebInspector.debuggerManager.activeCallFrame)
</span><span class="cx">             return;
</span><span class="lines">@@ -792,10 +692,6 @@
</span><span class="cx">         this._activeCallFrameTreeElement = this._callStackTreeOutline.findTreeElement(WebInspector.debuggerManager.activeCallFrame);
</span><span class="cx">         if (this._activeCallFrameTreeElement)
</span><span class="cx">             this._activeCallFrameTreeElement.isActiveCallFrame = true;
</span><del>-
-        this._singleThreadActiveCallFrameTreeElement = this._singleThreadCallStackTreeOutline.findTreeElement(WebInspector.debuggerManager.activeCallFrame);
-        if (this._singleThreadActiveCallFrameTreeElement)
-            this._singleThreadActiveCallFrameTreeElement.isActiveCallFrame = true;
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _breakpointsBeneathTreeElement(treeElement)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsThreadTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ThreadTreeElement.js (209212 => 209213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ThreadTreeElement.js        2016-12-01 22:31:01 UTC (rev 209212)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ThreadTreeElement.js        2016-12-01 22:32:33 UTC (rev 209213)
</span><span class="lines">@@ -66,6 +66,33 @@
</span><span class="cx">             activeCallFrameTreeElement.isActiveCallFrame = true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        let currentStackTrace = targetData.asyncStackTrace;
+        while (currentStackTrace) {
+            console.assert(currentStackTrace.callFrames.length, &quot;StackTrace should have non-empty call frames array.&quot;);
+            if (!currentStackTrace.callFrames.length)
+                break;
+
+            let boundaryCallFrame;
+            if (currentStackTrace.topCallFrameIsBoundary) {
+                boundaryCallFrame = currentStackTrace.callFrames[0];
+                console.assert(boundaryCallFrame.nativeCode &amp;&amp; !boundaryCallFrame.sourceCodeLocation);
+            } else {
+                // Create a generic native CallFrame for the asynchronous boundary.
+                const functionName = WebInspector.UIString(&quot;(async)&quot;);
+                const nativeCode = true;
+                boundaryCallFrame = new WebInspector.CallFrame(null, null, null, functionName, null, null, nativeCode);
+            }
+
+            const isAsyncBoundaryCallFrame = true;
+            this.appendChild(new WebInspector.CallFrameTreeElement(boundaryCallFrame, isAsyncBoundaryCallFrame));
+
+            let startIndex = currentStackTrace.topCallFrameIsBoundary ? 1 : 0;
+            for (let i = startIndex; i &lt; currentStackTrace.callFrames.length; ++i)
+                this.appendChild(new WebInspector.CallFrameTreeElement(currentStackTrace.callFrames[i]));
+
+            currentStackTrace = currentStackTrace.parentStackTrace;
+        }
+
</ins><span class="cx">         this.expand();
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>