<!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>[198358] 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/198358">198358</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-17 16:25:40 -0700 (Thu, 17 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Prefer retained size to the shallow size in Heap Snapshot data grids
https://bugs.webkit.org/show_bug.cgi?id=155597
<rdar://problem/25225087>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-03-17
Reviewed by Timothy Hatcher.
* Localizations/en.lproj/localizedStrings.js:
New datagrid column and tooltip strings.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.insertColumn):
Allow a column definition to provide a tooltip for the header cell.
* UserInterface/Views/HeapSnapshotClassDataGridNode.js:
(WebInspector.HeapSnapshotClassDataGridNode.prototype.createCellContent):
Include retained size column data.
(WebInspector.HeapSnapshotClassDataGridNode.prototype._populate):
Fix non-batched populate to sort instances on first population.
* UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:
(WebInspector.HeapSnapshotInstanceDataGridNode.prototype.createCellContent):
Include retained size column data.
* UserInterface/Views/HeapSnapshotInstancesContentView.js:
(WebInspector.HeapSnapshotInstancesContentView):
Include a retained size column. Update initial sort and column widths.
* UserInterface/Views/HeapSnapshotInstancesDataGridTree.js:
(WebInspector.HeapSnapshotInstancesDataGridTree.buildSortComparator):
Include a numeric sort comparator for the new retained size column.
(WebInspector.HeapSnapshotInstancesDataGridTree.prototype._populateTopLevel):
Include retained size, and lazily calculate percentage later.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotClassDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotClassDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstanceDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstancesContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstancesDataGridTreejs">trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesDataGridTree.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198357 => 198358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-17 22:48:41 UTC (rev 198357)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-17 23:25:40 UTC (rev 198358)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2016-03-17 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Prefer retained size to the shallow size in Heap Snapshot data grids
+ https://bugs.webkit.org/show_bug.cgi?id=155597
+ <rdar://problem/25225087>
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ New datagrid column and tooltip strings.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.insertColumn):
+ Allow a column definition to provide a tooltip for the header cell.
+
+ * UserInterface/Views/HeapSnapshotClassDataGridNode.js:
+ (WebInspector.HeapSnapshotClassDataGridNode.prototype.createCellContent):
+ Include retained size column data.
+
+ (WebInspector.HeapSnapshotClassDataGridNode.prototype._populate):
+ Fix non-batched populate to sort instances on first population.
+
+ * UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:
+ (WebInspector.HeapSnapshotInstanceDataGridNode.prototype.createCellContent):
+ Include retained size column data.
+
+ * UserInterface/Views/HeapSnapshotInstancesContentView.js:
+ (WebInspector.HeapSnapshotInstancesContentView):
+ Include a retained size column. Update initial sort and column widths.
+
+ * UserInterface/Views/HeapSnapshotInstancesDataGridTree.js:
+ (WebInspector.HeapSnapshotInstancesDataGridTree.buildSortComparator):
+ Include a numeric sort comparator for the new retained size column.
+
+ (WebInspector.HeapSnapshotInstancesDataGridTree.prototype._populateTopLevel):
+ Include retained size, and lazily calculate percentage later.
+
+2016-03-17 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: HeapSnapshots are slow and use too much memory
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155571
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (198357 => 198358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-03-17 22:48:41 UTC (rev 198357)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-03-17 23:25:40 UTC (rev 198358)
</span><span class="lines">@@ -592,6 +592,7 @@
</span><span class="cx"> localizedStrings["Response"] = "Response";
</span><span class="cx"> localizedStrings["Response Headers"] = "Response Headers";
</span><span class="cx"> localizedStrings["Restart (%s)"] = "Restart (%s)";
</span><ins>+localizedStrings["Retained Size"] = "Retained Size";
</ins><span class="cx"> localizedStrings["Return type for anonymous function"] = "Return type for anonymous function";
</span><span class="cx"> localizedStrings["Return type for function: %s"] = "Return type for function: %s";
</span><span class="cx"> localizedStrings["Reveal in DOM Tree"] = "Reveal in DOM Tree";
</span><span class="lines">@@ -622,6 +623,7 @@
</span><span class="cx"> localizedStrings["Selected Symbol"] = "Selected Symbol";
</span><span class="cx"> localizedStrings["Selected Value"] = "Selected Value";
</span><span class="cx"> localizedStrings["Self"] = "Self";
</span><ins>+localizedStrings["Self Size"] = "Self Size";
</ins><span class="cx"> localizedStrings["Self Time"] = "Self Time";
</span><span class="cx"> localizedStrings["Semantic Issue"] = "Semantic Issue";
</span><span class="cx"> localizedStrings["Session"] = "Session";
</span><span class="lines">@@ -649,6 +651,7 @@
</span><span class="cx"> localizedStrings["Show type information"] = "Show type information";
</span><span class="cx"> localizedStrings["Shrink"] = "Shrink";
</span><span class="cx"> localizedStrings["Size"] = "Size";
</span><ins>+localizedStrings["Size of the current object plus the size of all objects it keeps alive."] = "Size of the current object plus the size of all objects it keeps alive.";
</ins><span class="cx"> localizedStrings["Sizing"] = "Sizing";
</span><span class="cx"> localizedStrings["Slice"] = "Slice";
</span><span class="cx"> localizedStrings["Small %s"] = "Small %s";
</span><span class="lines">@@ -722,7 +725,6 @@
</span><span class="cx"> localizedStrings["Toggle Classes"] = "Toggle Classes";
</span><span class="cx"> localizedStrings["Top"] = "Top";
</span><span class="cx"> localizedStrings["Top Down"] = "Top Down";
</span><del>-localizedStrings["Total Size"] = "Total Size";
</del><span class="cx"> localizedStrings["Total Time"] = "Total Time";
</span><span class="cx"> localizedStrings["Total memory size at the end of the selected time range"] = "Total memory size at the end of the selected time range";
</span><span class="cx"> localizedStrings["Total number of resources, click to show the Resources tab"] = "Total number of resources, click to show the Resources tab";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (198357 => 198358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-03-17 22:48:41 UTC (rev 198357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-03-17 23:25:40 UTC (rev 198358)
</span><span class="lines">@@ -497,6 +497,9 @@
</span><span class="cx"> if (column["group"])
</span><span class="cx"> headerCellElement.classList.add("column-group-" + column["group"]);
</span><span class="cx">
</span><ins>+ if (column["tooltip"])
+ headerCellElement.title = column["tooltip"];
+
</ins><span class="cx"> if (column["collapsesGroup"]) {
</span><span class="cx"> console.assert(column["group"] !== column["collapsesGroup"]);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotClassDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotClassDataGridNode.js (198357 => 198358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotClassDataGridNode.js 2016-03-17 22:48:41 UTC (rev 198357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotClassDataGridNode.js 2016-03-17 23:25:40 UTC (rev 198358)
</span><span class="lines">@@ -44,18 +44,21 @@
</span><span class="cx">
</span><span class="cx"> createCellContent(columnIdentifier)
</span><span class="cx"> {
</span><del>- if (columnIdentifier === "size") {
- let {size, percent} = this._data;
</del><ins>+ if (columnIdentifier === "retainedSize") {
+ let size = this._data.retainedSize;
</ins><span class="cx"> let fragment = document.createDocumentFragment();
</span><del>- let timeElement = fragment.appendChild(document.createElement("span"));
- timeElement.classList.add("size");
- timeElement.textContent = Number.bytesToString(size);
</del><ins>+ let sizeElement = fragment.appendChild(document.createElement("span"));
+ sizeElement.classList.add("size");
+ sizeElement.textContent = Number.bytesToString(size);
</ins><span class="cx"> let percentElement = fragment.appendChild(document.createElement("span"));
</span><span class="cx"> percentElement.classList.add("percentage");
</span><del>- percentElement.textContent = Number.percentageString(percent);
</del><ins>+ percentElement.textContent = emDash;
</ins><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (columnIdentifier === "size")
+ return Number.bytesToString(this._data.size);
+
</ins><span class="cx"> if (columnIdentifier === "className") {
</span><span class="cx"> let {className, allInternal} = this._data;
</span><span class="cx"> let fragment = document.createDocumentFragment();
</span><span class="lines">@@ -74,7 +77,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (this._batched) {
</span><span class="cx"> this._removeFetchMoreDataGridNode();
</span><del>- this._updateBatchedSort();
</del><ins>+ this._sortInstances();
</ins><span class="cx"> this._updateBatchedChildren();
</span><span class="cx"> this._appendFetchMoreDataGridNode();
</span><span class="cx"> return;
</span><span class="lines">@@ -96,23 +99,22 @@
</span><span class="cx"> this.removeEventListener("populate", this._populate, this);
</span><span class="cx">
</span><span class="cx"> this._tree.heapSnapshot.instancesWithClassName(this._data.className, (instances) => {
</span><ins>+ this._instances = instances;
+ this._sortInstances();
+
</ins><span class="cx"> // Batch.
</span><span class="cx"> if (instances.length > WebInspector.HeapSnapshotClassDataGridNode.ChildrenBatchLimit) {
</span><span class="cx"> // FIXME: This should respect the this._tree.includeInternalObjects setting.
</span><del>- this._instances = instances;
</del><span class="cx"> this._batched = true;
</span><del>- this._updateBatchedSort();
</del><span class="cx"> this._fetchBatch(WebInspector.HeapSnapshotClassDataGridNode.ChildrenBatchLimit);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (let instance of instances) {
</del><ins>+ for (let instance of this._instances) {
</ins><span class="cx"> if (instance.internal && !this._tree.includeInternalObjects)
</span><span class="cx"> continue;
</span><span class="cx"> this.appendChild(new WebInspector.HeapSnapshotInstanceDataGridNode(instance, this._tree));
</span><span class="cx"> }
</span><del>-
- this.sort();
</del><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,7 +141,7 @@
</span><span class="cx"> this._appendFetchMoreDataGridNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _updateBatchedSort()
</del><ins>+ _sortInstances()
</ins><span class="cx"> {
</span><span class="cx"> this._instances.sort((a, b) => {
</span><span class="cx"> let fakeDataGridNodeA = {data: a};
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstanceDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js (198357 => 198358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js 2016-03-17 22:48:41 UTC (rev 198357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js 2016-03-17 23:25:40 UTC (rev 198358)
</span><span class="lines">@@ -36,8 +36,6 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Make instance grid nodes copyable.
</span><span class="cx"> this.copyable = false;
</span><del>-
- this._percent = (this._node.size / this._tree._heapSnapshot.totalSize) * 100;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Static
</span><span class="lines">@@ -99,19 +97,22 @@
</span><span class="cx">
</span><span class="cx"> createCellContent(columnIdentifier)
</span><span class="cx"> {
</span><del>- if (columnIdentifier === "size") {
- let size = this._node.size;
- let percent = this._percent;
</del><ins>+ if (columnIdentifier === "retainedSize") {
+ let size = this._node.retainedSize;
</ins><span class="cx"> let fragment = document.createDocumentFragment();
</span><del>- let timeElement = fragment.appendChild(document.createElement("span"));
- timeElement.classList.add("size");
- timeElement.textContent = Number.bytesToString(size);
</del><ins>+ let sizeElement = fragment.appendChild(document.createElement("span"));
+ sizeElement.classList.add("size");
+ sizeElement.textContent = Number.bytesToString(size);
+ let percent = (size / this._tree._heapSnapshot.totalSize) * 100;
</ins><span class="cx"> let percentElement = fragment.appendChild(document.createElement("span"));
</span><span class="cx"> percentElement.classList.add("percentage");
</span><span class="cx"> percentElement.textContent = Number.percentageString(percent);
</span><span class="cx"> return fragment;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (columnIdentifier === "size")
+ return Number.bytesToString(this._node.size);
+
</ins><span class="cx"> if (columnIdentifier === "className") {
</span><span class="cx"> let {className, id, internal} = this._node;
</span><span class="cx"> let containerElement = document.createElement("span");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstancesContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.js (198357 => 198358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.js 2016-03-17 22:48:41 UTC (rev 198357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesContentView.js 2016-03-17 23:25:40 UTC (rev 198358)
</span><span class="lines">@@ -36,15 +36,22 @@
</span><span class="cx"> let {showInternalObjects} = extraArguments;
</span><span class="cx">
</span><span class="cx"> let columns = {
</span><del>- size: {
- title: WebInspector.UIString("Total Size"),
</del><ins>+ retainedSize: {
+ title: WebInspector.UIString("Retained Size"),
+ tooltip: WebInspector.UIString("Size of the current object plus the size of all objects it keeps alive."),
</ins><span class="cx"> width: "140px",
</span><span class="cx"> aligned: "right",
</span><ins>+ sortable: true,
+ },
+ size: {
+ title: WebInspector.UIString("Self Size"),
+ width: "90px",
+ aligned: "right",
</ins><span class="cx"> sortable: true,
</span><span class="cx"> },
</span><span class="cx"> count: {
</span><span class="cx"> title: WebInspector.UIString("Count"),
</span><del>- width: "80px",
</del><ins>+ width: "75px",
</ins><span class="cx"> aligned: "right",
</span><span class="cx"> sortable: true,
</span><span class="cx"> },
</span><span class="lines">@@ -56,7 +63,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> this._dataGrid = new WebInspector.DataGrid(columns);
</span><del>- this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("heap-snapshot-content-view-sort", "size");
</del><ins>+ this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting("heap-snapshot-content-view-sort", "retainedSize");
</ins><span class="cx"> this._dataGrid.sortOrderSetting = new WebInspector.Setting("heap-snapshot-content-view-sort-order", WebInspector.DataGrid.SortOrder.Descending);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHeapSnapshotInstancesDataGridTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesDataGridTree.js (198357 => 198358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesDataGridTree.js 2016-03-17 22:48:41 UTC (rev 198357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstancesDataGridTree.js 2016-03-17 23:25:40 UTC (rev 198358)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx">
</span><span class="cx"> let comparator;
</span><span class="cx"> switch (columnIdentifier) {
</span><ins>+ case "retainedSize":
+ return numberCompare.bind(this, "retainedSize");
</ins><span class="cx"> case "size":
</span><span class="cx"> return numberCompare.bind(this, "size");
</span><span class="cx"> case "count":
</span><span class="lines">@@ -158,13 +160,11 @@
</span><span class="cx"> this.removeChildren();
</span><span class="cx">
</span><span class="cx"> // Populate the first level with the different classes.
</span><del>- let totalSize = this._heapSnapshot.totalSize;
- for (let [className, {size, count, internalCount}] of this._heapSnapshot.categories) {
</del><ins>+ for (let [className, {size, retainedSize, count, internalCount}] of this._heapSnapshot.categories) {
</ins><span class="cx"> let allInternal = count === internalCount;
</span><span class="cx"> if (!this._includeInternalObjects && allInternal)
</span><span class="cx"> continue;
</span><del>- let percent = (size / totalSize) * 100;
- this.appendChild(new WebInspector.HeapSnapshotClassDataGridNode({className, size, count, percent, allInternal}, this));
</del><ins>+ this.appendChild(new WebInspector.HeapSnapshotClassDataGridNode({className, size, retainedSize, count, allInternal}, this));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>