<!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>[201197] branches/safari-602.1.32-branch/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/201197">201197</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-19 15:58:34 -0700 (Thu, 19 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/201191">r201191</a>. rdar://problem/26377366</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWebInspectorUIChangeLog">branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineDataGridNodejs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineDataGridNode.js</a></li>
<li><a href="#branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs">branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201196 => 201197)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 22:58:32 UTC (rev 201196)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 22:58:34 UTC (rev 201197)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-05-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r201191. rdar://problem/26377366
+
+ 2016-05-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Heap Snapshots taken before timeline view has a zero time do not get shown
+ https://bugs.webkit.org/show_bug.cgi?id=157923
+ <rdar://problem/26377366>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/HeapAllocationsTimelineDataGridNode.js:
+ (WebInspector.HeapAllocationsTimelineDataGridNode):
+ (WebInspector.HeapAllocationsTimelineDataGridNode.prototype.createCellContent):
+ (WebInspector.HeapAllocationsTimelineDataGridNode.prototype.updateTimestamp):
+ Show emDash for the timestamp if we don't yet have a zero time.
+ Update when we get a zero time.
+
+ * UserInterface/Views/HeapAllocationsTimelineView.js:
+ (WebInspector.HeapAllocationsTimelineView):
+ (WebInspector.HeapAllocationsTimelineView.prototype.layout):
+ (WebInspector.HeapAllocationsTimelineView.prototype.reset):
+ Save a list of nodes pre-zero time and update them when we get a zero time.
+
+2016-05-19 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r201183. rdar://problem/26375866
</span><span class="cx">
</span><span class="cx"> 2016-05-19 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineDataGridNode.js (201196 => 201197)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineDataGridNode.js 2016-05-19 22:58:32 UTC (rev 201196)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineDataGridNode.js 2016-05-19 22:58:34 UTC (rev 201197)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> this._data = {
</span><span class="cx"> name: this.displayName(),
</span><del>- timestamp: this._record.timestamp - zeroTime,
</del><ins>+ timestamp: zeroTime ? this._record.timestamp - zeroTime : NaN,
</ins><span class="cx"> size: this._record.heapSnapshot.totalSize,
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> return fragment;
</span><span class="cx">
</span><span class="cx"> case "timestamp":
</span><del>- return Number.secondsToString(this._data.timestamp, true);
</del><ins>+ return isNaN(this._data.timestamp) ? emDash : Number.secondsToString(this._data.timestamp, true);
</ins><span class="cx">
</span><span class="cx"> case "size":
</span><span class="cx"> return Number.bytesToString(this._data.size);
</span><span class="lines">@@ -78,4 +78,11 @@
</span><span class="cx"> {
</span><span class="cx"> this.element.classList.remove("baseline");
</span><span class="cx"> }
</span><ins>+
+ updateTimestamp(zeroTime)
+ {
+ console.assert(isNaN(this._data.timestamp));
+ this._data.timestamp = this._record.timestamp - zeroTime;
+ this.needsRefresh();
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebInspectorUIUserInterfaceViewsHeapAllocationsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js (201196 => 201197)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-05-19 22:58:32 UTC (rev 201196)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js 2016-05-19 22:58:34 UTC (rev 201197)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SelectionPathComponentsDidChange, this._contentViewSelectionPathComponentDidChange, this);
</span><span class="cx">
</span><span class="cx"> this._pendingRecords = [];
</span><ins>+ this._pendingZeroTimeDataGridNodes = [];
</ins><span class="cx">
</span><span class="cx"> timeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._heapAllocationsTimelineRecordAdded, this);
</span><span class="cx">
</span><span class="lines">@@ -235,12 +236,19 @@
</span><span class="cx">
</span><span class="cx"> layout()
</span><span class="cx"> {
</span><del>- // Wait to show records until our zeroTime has been set.
- // FIXME: Waiting until zero time causes snapshots taken without recording to not show up in the list.
- if (this._pendingRecords.length && this.zeroTime) {
</del><ins>+ if (this._pendingZeroTimeDataGridNodes.length && this.zeroTime) {
+ for (let dataGridNode of this._pendingZeroTimeDataGridNodes)
+ dataGridNode.updateTimestamp(this.zeroTime);
+ this._pendingZeroTimeDataGridNodes = [];
+ this._dataGrid._sort();
+ }
+
+ if (this._pendingRecords.length) {
</ins><span class="cx"> for (let heapAllocationsTimelineRecord of this._pendingRecords) {
</span><span class="cx"> let dataGridNode = new WebInspector.HeapAllocationsTimelineDataGridNode(heapAllocationsTimelineRecord, this.zeroTime, this);
</span><span class="cx"> this._dataGrid.addRowInSortOrder(null, dataGridNode);
</span><ins>+ if (!this.zeroTime)
+ this._pendingZeroTimeDataGridNodes.push(dataGridNode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._pendingRecords = [];
</span><span class="lines">@@ -256,6 +264,7 @@
</span><span class="cx">
</span><span class="cx"> this.showHeapSnapshotList();
</span><span class="cx"> this._pendingRecords = [];
</span><ins>+ this._pendingZeroTimeDataGridNodes = [];
</ins><span class="cx"> this._updateCompareHeapSnapshotButton();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>