<!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>[200425] trunk</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/200425">200425</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-04 13:00:21 -0700 (Wed, 04 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: GC Root Path sometimes does not go up to Window
https://bugs.webkit.org/show_bug.cgi?id=156768
<rdar://problem/25816131>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-04
Reviewed by Geoffrey Garen.
Source/WebInspectorUI:
* UserInterface/Proxies/HeapSnapshotNodeProxy.js:
(WebInspector.HeapSnapshotNodeProxy.prototype.retainers):
Include paths for debugging.
* UserInterface/Workers/HeapSnapshot/HeapSnapshot.js:
(HeapSnapshot.prototype.shortestGCRootPath):
(HeapSnapshot.prototype._isNodeGlobalObject):
Prefer the shortest GC Root Path that contains a known
global object, otherwise fallback to the shortest.
(HeapSnapshot.prototype.retainers):
Include paths for debugging.
LayoutTests:
* inspector/unit-tests/heap-snapshot-expected.txt:
* inspector/unit-tests/heap-snapshot.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsheapsnapshotexpectedtxt">trunk/LayoutTests/inspector/unit-tests/heap-snapshot-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsheapsnapshothtml">trunk/LayoutTests/inspector/unit-tests/heap-snapshot.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProxiesHeapSnapshotNodeProxyjs">trunk/Source/WebInspectorUI/UserInterface/Proxies/HeapSnapshotNodeProxy.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceWorkersHeapSnapshotHeapSnapshotjs">trunk/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/HeapSnapshot.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200424 => 200425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-04 19:51:16 UTC (rev 200424)
+++ trunk/LayoutTests/ChangeLog 2016-05-04 20:00:21 UTC (rev 200425)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: GC Root Path sometimes does not go up to Window
+ https://bugs.webkit.org/show_bug.cgi?id=156768
+ <rdar://problem/25816131>
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector/unit-tests/heap-snapshot-expected.txt:
+ * inspector/unit-tests/heap-snapshot.html:
+
</ins><span class="cx"> 2016-05-04 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline inspector/model/remote-object.html after r200422
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsheapsnapshotexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/heap-snapshot-expected.txt (200424 => 200425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/heap-snapshot-expected.txt 2016-05-04 19:51:16 UTC (rev 200424)
+++ trunk/LayoutTests/inspector/unit-tests/heap-snapshot-expected.txt 2016-05-04 20:00:21 UTC (rev 200425)
</span><span class="lines">@@ -39,5 +39,6 @@
</span><span class="cx">
</span><span class="cx"> -- Running test case: HeapSnapshotNodeProxy.prototype.retainers
</span><span class="cx"> PASS: Number of retainer nodes should match.
</span><ins>+PASS: Number of edges should match the number of nodes.
</ins><span class="cx"> PASS: Node values should match.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsheapsnapshothtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/heap-snapshot.html (200424 => 200425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/heap-snapshot.html 2016-05-04 19:51:16 UTC (rev 200424)
+++ trunk/LayoutTests/inspector/unit-tests/heap-snapshot.html 2016-05-04 20:00:21 UTC (rev 200425)
</span><span class="lines">@@ -246,10 +246,11 @@
</span><span class="cx"> let expectedNodes = testSnapshotNodeForWindowObject.incomingEdges.map((edge) => edge.from);
</span><span class="cx"> expectedNodes.sort((a, b) => a.id - b.id);
</span><span class="cx">
</span><del>- snapshotNodeForWindowObject.retainers((nodes) => {
</del><ins>+ snapshotNodeForWindowObject.retainers((nodes, edges) => {
</ins><span class="cx"> nodes.sort((a, b) => a.id - b.id);
</span><span class="cx"> InspectorTest.assert(nodes.length > 0, "Test only makes since if there are retainer nodes");
</span><span class="cx"> InspectorTest.expectThat(nodes.length === expectedNodes.length, "Number of retainer nodes should match.");
</span><ins>+ InspectorTest.expectThat(nodes.length === edges.length, "Number of edges should match the number of nodes.");
</ins><span class="cx"> InspectorTest.expectThat(nodes.every((node, i) => compareNodes(node, expectedNodes[i])), "Node values should match.");
</span><span class="cx"> resolve();
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200424 => 200425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-04 19:51:16 UTC (rev 200424)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-04 20:00:21 UTC (rev 200425)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: GC Root Path sometimes does not go up to Window
+ https://bugs.webkit.org/show_bug.cgi?id=156768
+ <rdar://problem/25816131>
+
+ Reviewed by Geoffrey Garen.
+
+ * UserInterface/Proxies/HeapSnapshotNodeProxy.js:
+ (WebInspector.HeapSnapshotNodeProxy.prototype.retainers):
+ Include paths for debugging.
+
+ * UserInterface/Workers/HeapSnapshot/HeapSnapshot.js:
+ (HeapSnapshot.prototype.shortestGCRootPath):
+ (HeapSnapshot.prototype._isNodeGlobalObject):
+ Prefer the shortest GC Root Path that contains a known
+ global object, otherwise fallback to the shortest.
+
+ (HeapSnapshot.prototype.retainers):
+ Include paths for debugging.
+
</ins><span class="cx"> 2016-05-03 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Adding a new console message shouldn't modify DOM when the console log is hidden
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProxiesHeapSnapshotNodeProxyjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Proxies/HeapSnapshotNodeProxy.js (200424 => 200425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Proxies/HeapSnapshotNodeProxy.js 2016-05-04 19:51:16 UTC (rev 200424)
+++ trunk/Source/WebInspectorUI/UserInterface/Proxies/HeapSnapshotNodeProxy.js 2016-05-04 20:00:21 UTC (rev 200425)
</span><span class="lines">@@ -89,8 +89,10 @@
</span><span class="cx">
</span><span class="cx"> retainers(callback)
</span><span class="cx"> {
</span><del>- WebInspector.HeapSnapshotWorkerProxy.singleton().callMethod(this._proxyObjectId, "retainers", this.id, (serializedNodes) => {
- callback(serializedNodes.map(WebInspector.HeapSnapshotNodeProxy.deserialize.bind(null, this._proxyObjectId)));
</del><ins>+ WebInspector.HeapSnapshotWorkerProxy.singleton().callMethod(this._proxyObjectId, "retainers", this.id, ({retainers: serializedNodes, edges: serializedEdges}) => {
+ let deserializedNodes = serializedNodes.map(WebInspector.HeapSnapshotNodeProxy.deserialize.bind(null, this._proxyObjectId));
+ let deserializedEdges = serializedEdges.map(WebInspector.HeapSnapshotEdgeProxy.deserialize.bind(null, this._proxyObjectId));
+ callback(deserializedNodes, deserializedEdges);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceWorkersHeapSnapshotHeapSnapshotjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/HeapSnapshot.js (200424 => 200425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/HeapSnapshot.js 2016-05-04 19:51:16 UTC (rev 200424)
+++ trunk/Source/WebInspectorUI/UserInterface/Workers/HeapSnapshot/HeapSnapshot.js 2016-05-04 20:00:21 UTC (rev 200425)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> shortestGCRootPath(nodeIdentifier)
</span><span class="cx"> {
</span><span class="cx"> // Returns an array from this node to a gcRoot node.
</span><del>- // E.g. [Node, Edge, Node, Edge, Node].
</del><ins>+ // E.g. [Node (target), Edge, Node, Edge, Node (root)].
</ins><span class="cx"> // Internal nodes are avoided, so if the path is empty this
</span><span class="cx"> // node is either a gcRoot or only reachable via Internal nodes.
</span><span class="cx">
</span><span class="lines">@@ -247,8 +247,17 @@
</span><span class="cx"> return [];
</span><span class="cx">
</span><span class="cx"> paths.sort((a, b) => a.length - b.length);
</span><del>- let shortestPath = paths[0];
</del><span class="cx">
</span><ins>+ let shortestPathWithGlobalObject = null;
+ for (let path of paths) {
+ let lastNodeIndex = path[path.length - 1].node;
+ if (this._isNodeGlobalObject(lastNodeIndex)) {
+ shortestPathWithGlobalObject = path;
+ break;
+ }
+ }
+
+ let shortestPath = shortestPathWithGlobalObject || paths[0];
</ins><span class="cx"> console.assert("node" in shortestPath[0], "Path should start with a node");
</span><span class="cx"> console.assert("node" in shortestPath[shortestPath.length - 1], "Path should end with a node");
</span><span class="cx">
</span><span class="lines">@@ -296,6 +305,7 @@
</span><span class="cx"> retainers(nodeIdentifier)
</span><span class="cx"> {
</span><span class="cx"> let retainers = [];
</span><ins>+ let edges = [];
</ins><span class="cx">
</span><span class="cx"> let nodeOrdinal = this._nodeIdentifierToOrdinal.get(nodeIdentifier);
</span><span class="cx"> let incomingEdgeIndex = this._nodeOrdinalToFirstIncomingEdge[nodeOrdinal];
</span><span class="lines">@@ -304,9 +314,13 @@
</span><span class="cx"> let fromNodeOrdinal = this._incomingNodes[edgeIndex];
</span><span class="cx"> let fromNodeIndex = fromNodeOrdinal * nodeFieldCount;
</span><span class="cx"> retainers.push(fromNodeIndex);
</span><ins>+ edges.push(this._incomingEdges[edgeIndex]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return retainers.map(this.serializeNode, this);
</del><ins>+ return {
+ retainers: retainers.map(this.serializeNode, this),
+ edges: edges.map(this.serializeEdge, this),
+ };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -410,7 +424,7 @@
</span><span class="cx"> let count = this._nodeOrdinalToFirstIncomingEdge[nodeOrdinal];
</span><span class="cx"> this._nodeOrdinalToFirstIncomingEdge[nodeOrdinal] = runningFirstIndex;
</span><span class="cx"> this._incomingNodes[runningFirstIndex] = count;
</span><del>- runningFirstIndex += count;
</del><ins>+ runningFirstIndex += count;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fill in the incoming edges list. Use the count as an offset when placing edges in the list.
</span><span class="lines">@@ -518,7 +532,7 @@
</span><span class="cx"> dominators.fill(noEntry);
</span><span class="cx">
</span><span class="cx"> // Mark the root's dominator value.
</span><del>- dominators[rootPostOrderIndex] = rootPostOrderIndex;
</del><ins>+ dominators[rootPostOrderIndex] = rootPostOrderIndex;
</ins><span class="cx">
</span><span class="cx"> // Affect the root's children. Also use this opportunity to mark them as GC roots.
</span><span class="cx"> let rootEdgeIndex = this._nodeOrdinalToFirstOutgoingEdge[rootNodeOrdinal];
</span><span class="lines">@@ -605,6 +619,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _isNodeGlobalObject(nodeIndex)
+ {
+ let className = this._nodeClassNamesTable[this._nodes[nodeIndex + nodeClassNameOffset]];
+ return className === "Window"
+ || className === "JSDOMWindowShell"
+ || className === "GlobalObject";
+ }
+
</ins><span class="cx"> _gcRootPathes(nodeIdentifier)
</span><span class="cx"> {
</span><span class="cx"> let targetNodeOrdinal = this._nodeIdentifierToOrdinal.get(nodeIdentifier);
</span></span></pre>
</div>
</div>
</body>
</html>