<!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>[199972] 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/199972">199972</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-04-24 18:03:22 -0700 (Sun, 24 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Error when selecting a bar in the Frames timeline
https://bugs.webkit.org/show_bug.cgi?id=156960
<rdar://problem/25897955>
Reviewed by Timothy Hatcher.
Fixes timeline grid node selection when record selected in the overview.
Adds general purpose `findNode` method to DataGrid.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.findNode):
Basic find function for locating a grid node in linear time.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._recordSelected):
Remove tree outline references, call generic select method.
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.selectRecord):
If a data grid was set, deselect current selection and select the node
associated with the timeline record.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199971 => 199972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-25 00:59:48 UTC (rev 199971)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-25 01:03:22 UTC (rev 199972)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-04-24 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Error when selecting a bar in the Frames timeline
+ https://bugs.webkit.org/show_bug.cgi?id=156960
+ <rdar://problem/25897955>
+
+ Reviewed by Timothy Hatcher.
+
+ Fixes timeline grid node selection when record selected in the overview.
+ Adds general purpose `findNode` method to DataGrid.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.findNode):
+ Basic find function for locating a grid node in linear time.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._recordSelected):
+ Remove tree outline references, call generic select method.
+
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.selectRecord):
+ If a data grid was set, deselect current selection and select the node
+ associated with the timeline record.
+
+2016-04-24 Matt Baker <mattbaker@apple.com>
+
</ins><span class="cx"> Web Inspector: Events in JavaScript & Events timeline have no profile children
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156627
</span><span class="cx"> <rdar://problem/25749740>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (199971 => 199972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-04-25 00:59:48 UTC (rev 199971)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-04-25 01:03:22 UTC (rev 199972)
</span><span class="lines">@@ -1042,6 +1042,23 @@
</span><span class="cx"> this.children = [];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ findNode(comparator, skipHidden, stayWithin, dontPopulate)
+ {
+ console.assert(typeof comparator === "function");
+
+ let currentNode = this._rows[0];
+ while (currentNode && !currentNode.root) {
+ if (!currentNode.isPlaceholderNode && !(skipHidden && currentNode.hidden)) {
+ if (comparator(currentNode))
+ return currentNode;
+ }
+
+ currentNode = currentNode.traverseNextNode(skipHidden, stayWithin, dontPopulate);
+ }
+
+ return null;
+ }
+
</ins><span class="cx"> sortNodes(comparator)
</span><span class="cx"> {
</span><span class="cx"> if (this._sortNodesRequestId)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (199971 => 199972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-04-25 00:59:48 UTC (rev 199971)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-04-25 01:03:22 UTC (rev 199972)
</span><span class="lines">@@ -715,28 +715,12 @@
</span><span class="cx">
</span><span class="cx"> _recordSelected(event)
</span><span class="cx"> {
</span><del>- var timelineView = this._timelineViewMap.get(event.data.timeline);
</del><ins>+ let timelineView = this._timelineViewMap.get(event.data.timeline);
</ins><span class="cx"> console.assert(timelineView === this.currentTimelineView, timelineView);
</span><span class="cx"> if (timelineView !== this.currentTimelineView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var selectedTreeElement = this.currentTimelineView.navigationSidebarTreeOutline.selectedTreeElement;
- if (!event.data.record) {
- if (selectedTreeElement)
- selectedTreeElement.deselect();
- return;
- }
-
- var treeElement = this.currentTimelineView.navigationSidebarTreeOutline.findTreeElement(event.data.record);
- console.assert(treeElement, "Timeline view has no tree element for record selected in timeline overview.", timelineView, event.data.record);
- if (!treeElement || treeElement.selected)
- return;
-
- // Don't select the record's tree element if one of it's children is already selected.
- if (selectedTreeElement && selectedTreeElement.hasAncestor(treeElement))
- return;
-
- treeElement.revealAndSelect(false, false, false, true);
</del><ins>+ timelineView.selectRecord(event.data.record);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _timelineSelected()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (199971 => 199972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-04-25 00:59:48 UTC (rev 199971)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2016-04-25 01:03:22 UTC (rev 199972)
</span><span class="lines">@@ -142,6 +142,30 @@
</span><span class="cx"> // Implemented by sub-classes if needed.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ selectRecord(record)
+ {
+ if (!this._timelineDataGrid)
+ return;
+
+ let selectedDataGridNode = this._timelineDataGrid.selectedNode;
+ if (!record) {
+ if (selectedDataGridNode)
+ selectedDataGridNode.deselect();
+ return;
+ }
+
+ let dataGridNode = this._timelineDataGrid.findNode((node) => node.record === record);
+ console.assert(dataGridNode, "Timeline view has no grid node for record selected in timeline overview.", this, record);
+ if (!dataGridNode || dataGridNode.selected)
+ return;
+
+ // Don't select the record's grid node if one of it's children is already selected.
+ if (selectedDataGridNode && selectedDataGridNode.hasAncestor(dataGridNode))
+ return;
+
+ dataGridNode.revealAndSelect();
+ }
+
</ins><span class="cx"> matchTreeElementAgainstCustomFilters(treeElement)
</span><span class="cx"> {
</span><span class="cx"> // Implemented by sub-classes if needed.
</span></span></pre>
</div>
</div>
</body>
</html>