<!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>[198175] 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/198175">198175</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-14 16:35:22 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/197974">r197974</a>): HeapAllocationsTimelineView broken, doesn't handle Timeline Sidebar Navigation removal
https://bugs.webkit.org/show_bug.cgi?id=155458
<rdar://problem/25150803>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-03-14
Reviewed by Timothy Hatcher.
* UserInterface/Views/HeapAllocationsTimelineView.js:
(WebInspector.HeapAllocationsTimelineView):
(WebInspector.HeapAllocationsTimelineView.prototype.showHeapSnapshotTimelineRecord):
(WebInspector.HeapAllocationsTimelineView.prototype.get selectionPathComponents):
(WebInspector.HeapAllocationsTimelineView.prototype.layout):
(WebInspector.HeapAllocationsTimelineView.prototype._compareHeapSnapshotsClicked):
(WebInspector.HeapAllocationsTimelineView.prototype._dataGridNodeSelected):
(WebInspector.HeapAllocationsTimelineView.prototype.get navigationSidebarTreeOutlineLabel): Deleted.
Update the TimelineView now that there is no sidebar.
Remove any TreeOutline logic and replace with DataGrid logic.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198174 => 198175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-14 23:33:49 UTC (rev 198174)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-14 23:35:22 UTC (rev 198175)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-03-14 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: REGRESSION(r197974): HeapAllocationsTimelineView broken, doesn't handle Timeline Sidebar Navigation removal
+ https://bugs.webkit.org/show_bug.cgi?id=155458
+ <rdar://problem/25150803>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/HeapAllocationsTimelineView.js:
+ (WebInspector.HeapAllocationsTimelineView):
+ (WebInspector.HeapAllocationsTimelineView.prototype.showHeapSnapshotTimelineRecord):
+ (WebInspector.HeapAllocationsTimelineView.prototype.get selectionPathComponents):
+ (WebInspector.HeapAllocationsTimelineView.prototype.layout):
+ (WebInspector.HeapAllocationsTimelineView.prototype._compareHeapSnapshotsClicked):
+ (WebInspector.HeapAllocationsTimelineView.prototype._dataGridNodeSelected):
+ (WebInspector.HeapAllocationsTimelineView.prototype.get navigationSidebarTreeOutlineLabel): Deleted.
+ Update the TimelineView now that there is no sidebar.
+ Remove any TreeOutline logic and replace with DataGrid logic.
+
+2016-03-14 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: REGRESSION(r198026): Can't click on Snapshot in Timeline Overview
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155457
</span><span class="cx"> <rdar://problem/25150706>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js (198174 => 198175)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-03-14 23:33:49 UTC (rev 198174)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-03-14 23:35:22 UTC (rev 198175)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> this._snapshotListPathComponent = new WebInspector.HierarchicalPathComponent(WebInspector.UIString("Snapshot List"), "snapshot-list-icon", "snapshot-list", false, false);
</span><span class="cx"> this._snapshotListPathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.Clicked, this._snapshotListPathComponentClicked, this);
</span><span class="cx">
</span><del>- this._dataGrid = new WebInspector.TimelineDataGrid(this.navigationSidebarTreeOutline, columns);
</del><ins>+ this._dataGrid = new WebInspector.TimelineDataGrid(null, columns);
</ins><span class="cx"> this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("heap-allocations-timeline-view-sort", "timestamp");
</span><span class="cx"> this._dataGrid.sortOrderSetting = new WebInspector.Setting("heap-allocations-timeline-view-sort-order", WebInspector.DataGrid.SortOrder.Ascending);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><span class="lines">@@ -119,10 +119,12 @@
</span><span class="cx"> this._heapSnapshotDiff = null;
</span><span class="cx"> this._cancelSelectComparisonHeapSnapshots();
</span><span class="cx">
</span><del>- let treeElement = this.navigationSidebarTreeOutline.findTreeElement(heapSnapshotTimelineRecord);
- console.assert(treeElement, "Should have a TreeElement for the HeapSnapshot");
- if (treeElement)
- treeElement.select();
</del><ins>+ for (let dataGridNode of this._dataGrid.children) {
+ if (dataGridNode.record === heapSnapshotTimelineRecord) {
+ dataGridNode.select();
+ break;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> let shouldManuallyTriggerContentViewUpdate = this._contentViewContainer.currentContentView && this._contentViewContainer.currentContentView.representedObject === heapSnapshotTimelineRecord.heapSnapshot;
</span><span class="cx">
</span><span class="lines">@@ -172,8 +174,8 @@
</span><span class="cx"> let diffComponent = new WebInspector.HierarchicalPathComponent(WebInspector.UIString("Snapshot Comparison (%d and %d)").format(firstSnapshotIdentifier, secondSnapshotIdentifier), "snapshot-diff-icon", "snapshot-diff");
</span><span class="cx"> components.push(diffComponent);
</span><span class="cx"> } else {
</span><del>- if (this.navigationSidebarTreeOutline.selectedTreeElement) {
- let heapSnapshotPathComponent = new WebInspector.GeneralTreeElementPathComponent(this.navigationSidebarTreeOutline.selectedTreeElement);
</del><ins>+ if (this._dataGrid.selectedNode) {
+ let heapSnapshotPathComponent = new WebInspector.TimelineDataGridNodePathComponent(this._dataGrid.selectedNode);
</ins><span class="cx"> heapSnapshotPathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._snapshotPathComponentSelected, this);
</span><span class="cx"> components.push(heapSnapshotPathComponent);
</span><span class="cx"> }
</span><span class="lines">@@ -182,12 +184,6 @@
</span><span class="cx"> return components.concat(this._contentViewContainer.currentContentView.selectionPathComponents);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get navigationSidebarTreeOutlineLabel()
- {
- // FIXME: Nothing. The sidebar will soon be removed.
- return WebInspector.UIString("Snapshots");
- }
-
</del><span class="cx"> userSelectedRecordFromOverview(timelineRecord)
</span><span class="cx"> {
</span><span class="cx"> this.showHeapSnapshotTimelineRecord(timelineRecord);
</span><span class="lines">@@ -204,9 +200,8 @@
</span><span class="cx"> // Wait to show records until our zeroTime has been set.
</span><span class="cx"> if (this._pendingRecords.length && this.zeroTime) {
</span><span class="cx"> for (let heapAllocationsTimelineRecord of this._pendingRecords) {
</span><del>- let treeElement = new WebInspector.TimelineRecordTreeElement(heapAllocationsTimelineRecord);
</del><span class="cx"> let dataGridNode = new WebInspector.HeapAllocationsTimelineDataGridNode(heapAllocationsTimelineRecord, this.zeroTime, this);
</span><del>- this._dataGrid.addRowInSortOrder(treeElement, dataGridNode);
</del><ins>+ this._dataGrid.addRowInSortOrder(null, dataGridNode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._pendingRecords = [];
</span><span class="lines">@@ -310,8 +305,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (this.navigationSidebarTreeOutline.selectedTreeElement)
- this.navigationSidebarTreeOutline.selectedTreeElement.deselect();
</del><ins>+ if (this._dataGrid.selectedNode)
+ this._dataGrid.selectedNode.deselect();
</ins><span class="cx">
</span><span class="cx"> this._selectingComparisonHeapSnapshots = true;
</span><span class="cx"> this._baselineHeapSnapshotTimelineRecord = null;
</span><span class="lines">@@ -331,7 +326,7 @@
</span><span class="cx">
</span><span class="cx"> let heapAllocationsTimelineRecord = dataGridNode.record;
</span><span class="cx"> if (this._baselineHeapSnapshotTimelineRecord === heapAllocationsTimelineRecord) {
</span><del>- this.navigationSidebarTreeOutline.selectedTreeElement.deselect();
</del><ins>+ this._dataGrid.selectedNode.deselect();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -340,7 +335,7 @@
</span><span class="cx"> this._baselineDataGridNode = dataGridNode;
</span><span class="cx"> this._baselineDataGridNode.markAsBaseline();
</span><span class="cx"> this._baselineHeapSnapshotTimelineRecord = heapAllocationsTimelineRecord;
</span><del>- this.navigationSidebarTreeOutline.selectedTreeElement.deselect();
</del><ins>+ this._dataGrid.selectedNode.deselect();
</ins><span class="cx"> this._compareHeapSnapshotHelpTextItem.text = WebInspector.UIString("Select comparison snapshot");
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.NavigationItemsDidChange);
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>