<!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>[197958] 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/197958">197958</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-03-10 14:58:29 -0800 (Thu, 10 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: TreeOutlineDataGridSynchronizer should be optional in TimelineDataGrid
https://bugs.webkit.org/show_bug.cgi?id=155318
<rdar://problem/25091949>
Reviewed by Timothy Hatcher.
* UserInterface/Views/TimelineDataGrid.js:
(WebInspector.TimelineDataGrid):
TreeOutline is optional, and if non-null a tree outline synchronizer is created.
(WebInspector.TimelineDataGrid.prototype.shown):
(WebInspector.TimelineDataGrid.prototype.treeElementForDataGridNode):
(WebInspector.TimelineDataGrid.prototype.dataGridNodeForTreeElement):
(WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters):
Safety checks for the synchronizer.
(WebInspector.TimelineDataGrid.prototype.addRowInSortOrder):
treeElement is now an optional parameter. If non-null, a tree synchronizer
should exist. The third parameter has been overloaded, to allow passing
a parent tree element or data grid node.
(WebInspector.TimelineDataGrid.prototype._refreshDirtyDataGridNodes):
(WebInspector.TimelineDataGrid.prototype._sort):
Safety checks for the synchronizer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (197957 => 197958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-10 22:25:28 UTC (rev 197957)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-10 22:58:29 UTC (rev 197958)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-10 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: TreeOutlineDataGridSynchronizer should be optional in TimelineDataGrid
+ https://bugs.webkit.org/show_bug.cgi?id=155318
+ <rdar://problem/25091949>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid):
+ TreeOutline is optional, and if non-null a tree outline synchronizer is created.
+
+ (WebInspector.TimelineDataGrid.prototype.shown):
+ (WebInspector.TimelineDataGrid.prototype.treeElementForDataGridNode):
+ (WebInspector.TimelineDataGrid.prototype.dataGridNodeForTreeElement):
+ (WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters):
+ Safety checks for the synchronizer.
+
+ (WebInspector.TimelineDataGrid.prototype.addRowInSortOrder):
+ treeElement is now an optional parameter. If non-null, a tree synchronizer
+ should exist. The third parameter has been overloaded, to allow passing
+ a parent tree element or data grid node.
+
+ (WebInspector.TimelineDataGrid.prototype._refreshDirtyDataGridNodes):
+ (WebInspector.TimelineDataGrid.prototype._sort):
+ Safety checks for the synchronizer.
+
</ins><span class="cx"> 2016-03-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: JavaScript Heap Allocations Timeline
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (197957 => 197958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-03-10 22:25:28 UTC (rev 197957)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-03-10 22:58:29 UTC (rev 197958)
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx"> {
</span><span class="cx"> super(columns, editCallback, deleteCallback);
</span><span class="cx">
</span><del>- this._treeOutlineDataGridSynchronizer = new WebInspector.TreeOutlineDataGridSynchronizer(treeOutline, this, delegate);
</del><ins>+ if (treeOutline)
+ this._treeOutlineDataGridSynchronizer = new WebInspector.TreeOutlineDataGridSynchronizer(treeOutline, this, delegate);
</ins><span class="cx">
</span><span class="cx"> this.element.classList.add("timeline");
</span><span class="cx">
</span><span class="lines">@@ -89,7 +90,8 @@
</span><span class="cx"> {
</span><span class="cx"> // May be overridden by subclasses. If so, they should call the superclass.
</span><span class="cx">
</span><del>- this._treeOutlineDataGridSynchronizer.synchronize();
</del><ins>+ if (this._treeOutlineDataGridSynchronizer)
+ this._treeOutlineDataGridSynchronizer.synchronize();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> hidden()
</span><span class="lines">@@ -106,11 +108,17 @@
</span><span class="cx">
</span><span class="cx"> treeElementForDataGridNode(dataGridNode)
</span><span class="cx"> {
</span><ins>+ if (!this._treeOutlineDataGridSynchronizer)
+ return null;
+
</ins><span class="cx"> return this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> dataGridNodeForTreeElement(treeElement)
</span><span class="cx"> {
</span><ins>+ if (!this._treeOutlineDataGridSynchronizer)
+ return null;
+
</ins><span class="cx"> return this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(treeElement);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -122,6 +130,9 @@
</span><span class="cx">
</span><span class="cx"> treeElementMatchesActiveScopeFilters(treeElement)
</span><span class="cx"> {
</span><ins>+ if (!this._treeOutlineDataGridSynchronizer)
+ return false;
+
</ins><span class="cx"> var dataGridNode = this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(treeElement);
</span><span class="cx"> console.assert(dataGridNode);
</span><span class="cx">
</span><span class="lines">@@ -162,6 +173,38 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ addRowInSortOrder(treeElement, dataGridNode, parentTreeElementOrDataGridNode)
+ {
+ let parentDataGridNode = parentTreeElementOrDataGridNode || this;
+ let childElement = dataGridNode;
+
+ if (treeElement) {
+ console.assert(this._treeOutlineDataGridSynchronizer);
+ if (!this._treeOutlineDataGridSynchronizer)
+ return;
+
+ this._treeOutlineDataGridSynchronizer.associate(treeElement, dataGridNode);
+
+ console.assert(!parentTreeElementOrDataGridNode || parentTreeElementOrDataGridNode instanceof WebInspector.TreeElement);
+
+ let parentTreeElement = parentTreeElementOrDataGridNode || this._treeOutlineDataGridSynchronizer.treeOutline;
+ parentDataGridNode = parentTreeElement.root ? this : this._treeOutlineDataGridSynchronizer.dataGridNodeForTreeElement(parentTreeElement);
+
+ parentTreeElementOrDataGridNode = parentTreeElement;
+ childElement = treeElement;
+ }
+
+ if (this.sortColumnIdentifier) {
+ let insertionIndex = insertionIndexForObjectInListSortedByFunction(dataGridNode, parentDataGridNode.children, this._sortComparator.bind(this));
+
+ // If parent is a tree element, the synchronizer will insert into the data grid.
+ parentTreeElementOrDataGridNode.insertChild(childElement, insertionIndex);
+ } else {
+ // If parent is a tree element, the synchronizer will append to the data grid.
+ parentTreeElementOrDataGridNode.appendChild(childElement);
+ }
+ }
+
</ins><span class="cx"> shouldIgnoreSelectionEvent()
</span><span class="cx"> {
</span><span class="cx"> return this._ignoreSelectionEvent || false;
</span><span class="lines">@@ -197,7 +240,7 @@
</span><span class="cx"> this._scheduledDataGridNodeRefreshIdentifier = undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!this._dirtyDataGridNodes)
</del><ins>+ if (!this._dirtyDataGridNodes || !this._treeOutlineDataGridSynchronizer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var selectedNode = this.selectedNode;
</span><span class="lines">@@ -247,23 +290,26 @@
</span><span class="cx">
</span><span class="cx"> _sort()
</span><span class="cx"> {
</span><del>- var sortColumnIdentifier = this.sortColumnIdentifier;
</del><ins>+ let sortColumnIdentifier = this.sortColumnIdentifier;
</ins><span class="cx"> if (!sortColumnIdentifier)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var selectedNode = this.selectedNode;
</del><ins>+ let selectedNode = this.selectedNode;
</ins><span class="cx"> this._ignoreSelectionEvent = true;
</span><span class="cx">
</span><del>- this._treeOutlineDataGridSynchronizer.enabled = false;
</del><ins>+ let treeOutline;
+ if (this._treeOutlineDataGridSynchronizer) {
+ this._treeOutlineDataGridSynchronizer.enabled = false;
</ins><span class="cx">
</span><del>- var treeOutline = this._treeOutlineDataGridSynchronizer.treeOutline;
- if (treeOutline.selectedTreeElement)
- treeOutline.selectedTreeElement.deselect(true);
</del><ins>+ treeOutline = this._treeOutlineDataGridSynchronizer.treeOutline;
+ if (treeOutline.selectedTreeElement)
+ treeOutline.selectedTreeElement.deselect(true);
+ }
</ins><span class="cx">
</span><span class="cx"> // Collect parent nodes that need their children sorted. So this in two phases since
</span><span class="cx"> // traverseNextNode would get confused if we sort the tree while traversing it.
</span><del>- var parentDataGridNodes = [this];
- var currentDataGridNode = this.children[0];
</del><ins>+ let parentDataGridNodes = [this];
+ let currentDataGridNode = this.children[0];
</ins><span class="cx"> while (currentDataGridNode) {
</span><span class="cx"> if (currentDataGridNode.children.length)
</span><span class="cx"> parentDataGridNodes.push(currentDataGridNode);
</span><span class="lines">@@ -271,22 +317,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Sort the children of collected parent nodes.
</span><del>- for (var parentDataGridNode of parentDataGridNodes) {
- var parentTreeElement = parentDataGridNode === this ? treeOutline : this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(parentDataGridNode);
- console.assert(parentTreeElement);
</del><ins>+ for (let parentDataGridNode of parentDataGridNodes) {
+ let childDataGridNodes = parentDataGridNode.children.slice();
+ parentDataGridNode.removeChildren();
</ins><span class="cx">
</span><del>- var childDataGridNodes = parentDataGridNode.children.slice();
</del><ins>+ let parentTreeElement;
+ if (this._treeOutlineDataGridSynchronizer) {
+ parentTreeElement = parentDataGridNode === this ? treeOutline : this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(parentDataGridNode);
+ console.assert(parentTreeElement);
</ins><span class="cx">
</span><del>- parentDataGridNode.removeChildren();
- parentTreeElement.removeChildren();
</del><ins>+ parentTreeElement.removeChildren();
+ }
</ins><span class="cx">
</span><span class="cx"> childDataGridNodes.sort(this._sortComparator.bind(this));
</span><span class="cx">
</span><del>- for (var dataGridNode of childDataGridNodes) {
- var treeElement = this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
</del><ins>+ for (let dataGridNode of childDataGridNodes) {
+ let treeElement = this._treeOutlineDataGridSynchronizer.treeElementForDataGridNode(dataGridNode);
</ins><span class="cx"> console.assert(treeElement);
</span><span class="cx">
</span><del>- parentTreeElement.appendChild(treeElement);
</del><ins>+ if (parentTreeElement)
+ parentTreeElement.appendChild(treeElement);
+
</ins><span class="cx"> parentDataGridNode.appendChild(dataGridNode);
</span><span class="cx">
</span><span class="cx"> // Adding the tree element back to the tree outline subjects it to filters.
</span><span class="lines">@@ -295,7 +346,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this._treeOutlineDataGridSynchronizer.enabled = true;
</del><ins>+ if (this._treeOutlineDataGridSynchronizer)
+ this._treeOutlineDataGridSynchronizer.enabled = true;
</ins><span class="cx">
</span><span class="cx"> if (selectedNode)
</span><span class="cx"> selectedNode.revealAndSelect();
</span></span></pre>
</div>
</div>
</body>
</html>