Changeset 106738 in webkit

Timestamp:

Feb 4, 2012 2:20:07 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: get rid of cycles in retaining tree
​https://bugs.webkit.org/show_bug.cgi?id=77801

Drive by fix: 'retained by' prefix was removed.

Reviewed by Yury Semikhatsky.

• inspector/front-end/DetailedHeapshotGridNodes.js:

(WebInspector.HeapSnapshotObjectNode):
(WebInspector.HeapSnapshotObjectNode.prototype._updateHasChildren):
(WebInspector.HeapSnapshotObjectNode.prototype._createChildNode):
(WebInspector.HeapSnapshotObjectNode.prototype._prefixObjectCell):

• inspector/front-end/profilesPanel.css:

(.cycled-ancessor-node):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/DetailedHeapshotGridNodes.js (modified) (6 diffs)
• inspector/front-end/profilesPanel.css (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: get rid of cycles in retaining tree
+        https://bugs.webkit.org/show_bug.cgi?id=77801
+
+        Drive by fix: 'retained by' prefix was removed.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/DetailedHeapshotGridNodes.js:
+        (WebInspector.HeapSnapshotObjectNode):
+        (WebInspector.HeapSnapshotObjectNode.prototype._updateHasChildren):
+        (WebInspector.HeapSnapshotObjectNode.prototype._createChildNode):
+        (WebInspector.HeapSnapshotObjectNode.prototype._prefixObjectCell):
+        * inspector/front-end/profilesPanel.css:
+        (.cycled-ancessor-node):
+
 2012-02-04  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/DetailedHeapshotGridNodes.js

@@ -329 +329 @@
     },
 
-    _updateHasChildren: function()
+    updateHasChildren: function()
     {
         function isEmptyCallback(isEmpty)
@@ -360 +360 @@
 WebInspector.HeapSnapshotGenericObjectNode.prototype.__proto__ = WebInspector.HeapSnapshotGridNode.prototype;
 
-WebInspector.HeapSnapshotObjectNode = function(tree, isFromBaseSnapshot, edge)
+WebInspector.HeapSnapshotObjectNode = function(tree, isFromBaseSnapshot, edge, parentGridNode)
 {
     WebInspector.HeapSnapshotGenericObjectNode.call(this, tree, edge.node);
@@ -369 +369 @@
     this._isFromBaseSnapshot = isFromBaseSnapshot;
     this._provider = this._createProvider(!isFromBaseSnapshot ? tree.snapshot : tree.baseSnapshot, edge.nodeIndex, tree);
-    this._updateHasChildren();
+    this.updateHasChildren(parentGridNode);
 }
 
 WebInspector.HeapSnapshotObjectNode.prototype = {
+    updateHasChildren: function(parentGridNode)
+    {
+        if (this._retainerNode) {
+            this._parentGridNode = parentGridNode;
+            var ancestor = parentGridNode;
+            while (ancestor) {
+                if (ancestor.snapshotNodeId === this.snapshotNodeId) {
+                    this._cycledWithAncestorGridNode = ancestor;
+                    return;
+                }
+                ancestor = ancestor._parentGridNode;
+            }
+        }
+        WebInspector.HeapSnapshotGenericObjectNode.prototype.updateHasChildren.call(this);
+    },
+
     _createChildNode: function(item)
     {
-        return new WebInspector.HeapSnapshotObjectNode(this.dataGrid, this._isFromBaseSnapshot, item);
+        return new WebInspector.HeapSnapshotObjectNode(this.dataGrid, this._isFromBaseSnapshot, item, this);
     },
 
@@ -441 +457 @@
     {
         if (this._retainerNode) {
-            var prefixSpan = document.createElement("span");
-            prefixSpan.textContent = WebInspector.UIString("retained by ");
-            div.appendChild(prefixSpan);
+            if (this._cycledWithAncestorGridNode)
+                div.className += " cycled-ancessor-node";
             return;
         }
@@ -476 +491 @@
     this._isDeletedNode = !!baseSnapshot;
     this._provider = this._createProvider(baseSnapshot || snapshot, node.nodeIndex);
-    this._updateHasChildren();
+    this.updateHasChildren();
 };
 
@@ -806 +821 @@
     WebInspector.HeapSnapshotGenericObjectNode.call(this, tree, node);
     this._provider = this._createProvider(tree.snapshot, node.nodeIndex);
-    this._updateHasChildren();
+    this.updateHasChildren();
 };
 

trunk/Source/WebCore/inspector/front-end/profilesPanel.css

@@ -175 +175 @@
 }
 
+.cycled-ancessor-node {
+    color: lightgray;
+}
+
 .panel-enabler-view.profile-launcher-view button:not(.status-bar-item) {
     color: rgb(6, 6, 6);