<!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>[199974] 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/199974">199974</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-04-24 20:09:18 -0700 (Sun, 24 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Can't sort by name/source code location columns in Timeline data grids
https://bugs.webkit.org/show_bug.cgi?id=156965
<rdar://problem/25898716>
Reviewed by Timothy Hatcher.
Add support for sorting SourceCodeLocation objects to TimelineDataGrid,
and include a grid delegate so that views can extend sorting logic for
other document fragment columns.
* UserInterface/Views/NetworkTimelineView.js:
(WebInspector.NetworkTimelineView):
(WebInspector.NetworkTimelineView.prototype.dataGridSortComparator):
Sort "name" column by display name first, then resource URL.
* UserInterface/Views/ScriptDetailsTimelineView.js:
(WebInspector.ScriptDetailsTimelineView):
(WebInspector.ScriptDetailsTimelineView.prototype.dataGridSortComparator):
Sort "name" column by display name first, then subtitle.
* UserInterface/Views/ScriptTimelineDataGridNode.js:
(WebInspector.ScriptTimelineDataGridNode.prototype.get subtitle):
Make subtitle accessible externally for sorting.
(WebInspector.ScriptTimelineDataGridNode.prototype._createNameCellDocumentFragment):
(WebInspector.ScriptTimelineDataGridNode):
* UserInterface/Views/TimelineDataGrid.js:
(WebInspector.TimelineDataGrid):
(WebInspector.TimelineDataGrid.prototype.get sortDelegate):
(WebInspector.TimelineDataGrid.prototype.set sortDelegate):
Fire a SortChanged event if the delegate changed and the grid is sorted.
(WebInspector.TimelineDataGrid.prototype._sort):
If a sort delegate exists, and it returns a numeric value, skip the
default compare.
(WebInspector.TimelineDataGrid.prototype._sortComparator):
Add support for sorting SourceCodeLocation columns.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptDetailsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js</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 (199973 => 199974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-25 01:40:20 UTC (rev 199973)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-25 03:09:18 UTC (rev 199974)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2016-04-24 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Can't sort by name/source code location columns in Timeline data grids
+ https://bugs.webkit.org/show_bug.cgi?id=156965
+ <rdar://problem/25898716>
+
+ Reviewed by Timothy Hatcher.
+
+ Add support for sorting SourceCodeLocation objects to TimelineDataGrid,
+ and include a grid delegate so that views can extend sorting logic for
+ other document fragment columns.
+
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView):
+ (WebInspector.NetworkTimelineView.prototype.dataGridSortComparator):
+ Sort "name" column by display name first, then resource URL.
+
+ * UserInterface/Views/ScriptDetailsTimelineView.js:
+ (WebInspector.ScriptDetailsTimelineView):
+ (WebInspector.ScriptDetailsTimelineView.prototype.dataGridSortComparator):
+ Sort "name" column by display name first, then subtitle.
+
+ * UserInterface/Views/ScriptTimelineDataGridNode.js:
+ (WebInspector.ScriptTimelineDataGridNode.prototype.get subtitle):
+ Make subtitle accessible externally for sorting.
+ (WebInspector.ScriptTimelineDataGridNode.prototype._createNameCellDocumentFragment):
+ (WebInspector.ScriptTimelineDataGridNode):
+
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid):
+ (WebInspector.TimelineDataGrid.prototype.get sortDelegate):
+ (WebInspector.TimelineDataGrid.prototype.set sortDelegate):
+ Fire a SortChanged event if the delegate changed and the grid is sorted.
+ (WebInspector.TimelineDataGrid.prototype._sort):
+ If a sort delegate exists, and it returns a numeric value, skip the
+ default compare.
+
+ (WebInspector.TimelineDataGrid.prototype._sortComparator):
+ Add support for sorting SourceCodeLocation columns.
+
+2016-04-24 Matt Baker <mattbaker@apple.com>
+
</ins><span class="cx"> Web Inspector: Error when selecting a bar in the Frames timeline
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156960
</span><span class="cx"> <rdar://problem/25897955>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (199973 => 199974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-04-25 01:40:20 UTC (rev 199973)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-04-25 03:09:18 UTC (rev 199974)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> this._dataGrid = new WebInspector.TimelineDataGrid(columns);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><ins>+ this._dataGrid.sortDelegate = this;
</ins><span class="cx"> this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("network-timeline-view-sort", "requestSent");
</span><span class="cx"> this._dataGrid.sortOrderSetting = new WebInspector.Setting("network-timeline-view-sort-order", WebInspector.DataGrid.SortOrder.Ascending);
</span><span class="cx">
</span><span class="lines">@@ -152,6 +153,21 @@
</span><span class="cx"> this._pendingRecords = [];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // TimelineDataGrid sort delegate
+
+ dataGridSortComparator(sortColumnIdentifier, sortDirection, node1, node2)
+ {
+ if (sortColumnIdentifier !== "name")
+ return null;
+
+ let displayName1 = node1.displayName();
+ let displayName2 = node2.displayName();
+ if (displayName1 !== displayName2)
+ return displayName1.localeCompare(displayName2) * sortDirection;
+
+ return node1.resource.url.localeCompare(node2.resource.url) * sortDirection;
+ }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> canShowContentViewForTreeElement(treeElement)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptDetailsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js (199973 => 199974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js 2016-04-25 01:40:20 UTC (rev 199973)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptDetailsTimelineView.js 2016-04-25 03:09:18 UTC (rev 199974)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> this._dataGrid = new WebInspector.ScriptTimelineDataGrid(columns);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><ins>+ this._dataGrid.sortDelegate = this;
</ins><span class="cx"> this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("script-timeline-view-sort", "startTime");
</span><span class="cx"> this._dataGrid.sortOrderSetting = new WebInspector.Setting("script-timeline-view-sort-order", WebInspector.DataGrid.SortOrder.Ascending);
</span><span class="cx">
</span><span class="lines">@@ -145,6 +146,21 @@
</span><span class="cx"> this._pendingRecords = [];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // TimelineDataGrid sort delegate
+
+ dataGridSortComparator(sortColumnIdentifier, sortDirection, node1, node2)
+ {
+ if (sortColumnIdentifier !== "name")
+ return null;
+
+ let displayName1 = node1.displayName();
+ let displayName2 = node2.displayName();
+ if (displayName1 !== displayName2)
+ return displayName1.localeCompare(displayName2) * sortDirection;
+
+ return node1.subtitle.localeCompare(node2.subtitle) * sortDirection;
+ }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> dataGridNodePathComponentSelected(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js (199973 => 199974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2016-04-25 01:40:20 UTC (rev 199973)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2016-04-25 03:09:18 UTC (rev 199974)
</span><span class="lines">@@ -87,6 +87,24 @@
</span><span class="cx"> return this._cachedData;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get subtitle()
+ {
+ if (this._subtitle !== undefined)
+ return this._subtitle;
+
+ this._subtitle = "";
+
+ if (this._record.eventType === WebInspector.ScriptTimelineRecord.EventType.TimerInstalled) {
+ let timeoutString = Number.secondsToString(this._record.details.timeout / 1000);
+ if (this._record.details.repeating)
+ this._subtitle = WebInspector.UIString("%s interval").format(timeoutString);
+ else
+ this._subtitle = WebInspector.UIString("%s delay").format(timeoutString);
+ }
+
+ return this._subtitle;
+ }
+
</ins><span class="cx"> updateRangeTimes(startTime, endTime)
</span><span class="cx"> {
</span><span class="cx"> var oldRangeStartTime = this._rangeStartTime;
</span><span class="lines">@@ -145,16 +163,11 @@
</span><span class="cx"> let fragment = document.createDocumentFragment();
</span><span class="cx"> fragment.append(this.displayName());
</span><span class="cx">
</span><del>- if (this._record.eventType === WebInspector.ScriptTimelineRecord.EventType.TimerInstalled) {
</del><ins>+ if (this.subtitle) {
</ins><span class="cx"> let subtitleElement = document.createElement("span");
</span><span class="cx"> subtitleElement.classList.add("subtitle");
</span><ins>+ subtitleElement.textContent = this.subtitle;
</ins><span class="cx"> fragment.append(subtitleElement);
</span><del>-
- let timeoutString = Number.secondsToString(this._record.details.timeout / 1000);
- if (this._record.details.repeating)
- subtitleElement.textContent = WebInspector.UIString("%s interval").format(timeoutString);
- else
- subtitleElement.textContent = WebInspector.UIString("%s delay").format(timeoutString);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return fragment;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (199973 => 199974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-04-25 01:40:20 UTC (rev 199973)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2016-04-25 03:09:18 UTC (rev 199974)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> this.element.classList.add("timeline");
</span><span class="cx">
</span><span class="cx"> this._filterableColumns = [];
</span><ins>+ this._sortDelegate = null;
</ins><span class="cx">
</span><span class="cx"> // Check if any of the cells can be filtered.
</span><span class="cx"> for (var [identifier, column] of this.columns) {
</span><span class="lines">@@ -79,6 +80,23 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><ins>+ get sortDelegate()
+ {
+ return this._sortDelegate;
+ }
+
+ set sortDelegate(delegate)
+ {
+ delegate = delegate || null;
+ if (this._sortDelegate === delegate)
+ return;
+
+ this._sortDelegate = delegate;
+
+ if (this.sortOrder !== WebInspector.DataGrid.SortOrder.Indeterminate)
+ this.dispatchEventToListeners(WebInspector.DataGrid.Event.SortChanged);
+ }
+
</ins><span class="cx"> reset()
</span><span class="cx"> {
</span><span class="cx"> // May be overridden by subclasses. If so, they should call the superclass.
</span><span class="lines">@@ -282,6 +300,9 @@
</span><span class="cx">
</span><span class="cx"> _sort()
</span><span class="cx"> {
</span><ins>+ if (!this.children.length)
+ return;
+
</ins><span class="cx"> let sortColumnIdentifier = this.sortColumnIdentifier;
</span><span class="cx"> if (!sortColumnIdentifier)
</span><span class="cx"> return;
</span><span class="lines">@@ -357,6 +378,12 @@
</span><span class="cx">
</span><span class="cx"> var sortDirection = this.sortOrder === WebInspector.DataGrid.SortOrder.Ascending ? 1 : -1;
</span><span class="cx">
</span><ins>+ if (this._sortDelegate && typeof this._sortDelegate.dataGridSortComparator === "function") {
+ let result = this._sortDelegate.dataGridSortComparator(sortColumnIdentifier, sortDirection, node1, node2);
+ if (typeof result === "number")
+ return result;
+ }
+
</ins><span class="cx"> var value1 = node1.data[sortColumnIdentifier];
</span><span class="cx"> var value2 = node2.data[sortColumnIdentifier];
</span><span class="cx">
</span><span class="lines">@@ -384,6 +411,11 @@
</span><span class="cx"> value2 = value2 ? value2.displayName || "" : "";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (value1 instanceof WebInspector.SourceCodeLocation || value2 instanceof WebInspector.SourceCodeLocation) {
+ value1 = value1 ? value1.displayLocationString() || "" : "";
+ value2 = value2 ? value2.displayLocationString() || "" : "";
+ }
+
</ins><span class="cx"> // For everything else (mostly booleans).
</span><span class="cx"> return (value1 < value2 ? -1 : (value1 > value2 ? 1 : 0)) * sortDirection;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>