Changeset 117753 in webkit

Timestamp:

May 21, 2012 2:49:53 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: expand only neighbors of the highlighted node when revealing it in heap snapshot
​https://bugs.webkit.org/show_bug.cgi?id=86998

Reviewed by Pavel Feldman.

Only nearest nodes are expanded when a node is revealed in heap snapshot
summary view.

• inspector/front-end/HeapSnapshotDataGrids.js:

(WebInspector.HeapSnapshotSortableDataGrid.prototype.highlightNode):
(WebInspector.HeapSnapshotViewportDataGrid.prototype.highlightNode):
(WebInspector.HeapSnapshotViewportDataGrid.prototype._isScrolledIntoView):

• inspector/front-end/HeapSnapshotGridNodes.js:

(WebInspector.HeapSnapshotConstructorNode.prototype.revealNodeBySnapshotObjectId):
(WebInspector.HeapSnapshotConstructorNode.prototype.revealNodeBySnapshotObjectId.didGetNodePosition):

• inspector/front-end/ProfilesPanel.js:

(WebInspector.ProfilesPanel.prototype.showProfile):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/HeapSnapshotDataGrids.js (modified) (2 diffs)
• inspector/front-end/HeapSnapshotGridNodes.js (modified) (2 diffs)
• inspector/front-end/ProfilesPanel.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: expand only neighbors of the highlighted node when revealing it in heap snapshot
+        https://bugs.webkit.org/show_bug.cgi?id=86998
+
+        Reviewed by Pavel Feldman.
+
+        Only nearest nodes are expanded when a node is revealed in heap snapshot
+        summary view.
+
+        * inspector/front-end/HeapSnapshotDataGrids.js:
+        (WebInspector.HeapSnapshotSortableDataGrid.prototype.highlightNode):
+        (WebInspector.HeapSnapshotViewportDataGrid.prototype.highlightNode):
+        (WebInspector.HeapSnapshotViewportDataGrid.prototype._isScrolledIntoView):
+        * inspector/front-end/HeapSnapshotGridNodes.js:
+        (WebInspector.HeapSnapshotConstructorNode.prototype.revealNodeBySnapshotObjectId):
+        (WebInspector.HeapSnapshotConstructorNode.prototype.revealNodeBySnapshotObjectId.didGetNodePosition):
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype.showProfile):
+
 2012-05-21  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

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

@@ -87 +87 @@
     highlightNode: function(node)
     {
+        var prevNode = this._highlightedNode;
         this._clearCurrentHighlight();
         this._highlightedNode = node;
         this._highlightedNode.element.addStyleClass("highlighted-row");
+        // If highlighted node hasn't changed reinsert it to make the highlight animation restart.
+        if (node === prevNode) {
+            var element = node.element;
+            var parent = element.parentElement;
+            var nextSibling = element.nextSibling;
+            parent.removeChild(element);
+            parent.insertBefore(element, nextSibling);
+        }
     },
 
@@ -279 +288 @@
     highlightNode: function(node)
     {
-        node.element.scrollIntoViewIfNeeded(true);
-        this._nodeToHighlightAfterScroll = node;
+        if (this._isScrolledIntoView(node.element))
+            WebInspector.HeapSnapshotSortableDataGrid.prototype.highlightNode.call(this, node);
+        else {
+            node.element.scrollIntoViewIfNeeded(true);
+            this._nodeToHighlightAfterScroll = node;
+        }
+    },
+
+    _isScrolledIntoView: function(element)
+    {
+        var viewportTop = this.scrollContainer.scrollTop;
+        var viewportBottom = viewportTop + this.scrollContainer.clientHeight;
+        var elemTop = element.offsetTop
+        var elemBottom = elemTop + element.offsetHeight;
+        return elemBottom <= viewportBottom && elemTop >= viewportTop;
     },
 

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

@@ -729 +729 @@
     revealNodeBySnapshotObjectId: function(snapshotObjectId)
     {
+        function didExpand()
+        {
+            this._provider.nodePosition(snapshotObjectId, didGetNodePosition.bind(this));
+        }
+
         function didGetNodePosition(nodePosition)
         {
-            if (nodePosition !== -1)
+            if (nodePosition === -1) {
+                this.collapse();
+                callback(null);
+            } else
                 this._populateChildren(nodePosition, null, didPopulateChildren.bind(this, nodePosition));
         }
@@ -750 +758 @@
         }
 
-        this.expand();
-        this._provider.nodePosition(snapshotObjectId, didGetNodePosition.bind(this));
+        this.expandWithoutPopulate(didExpand.bind(this));
     },
 

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

@@ -559 +559 @@
             return;
 
+        var view = profile.view();
+        if (view === this.visibleView)
+            return;
+
         this.closeVisibleView();
-
-        var view = profile.view();
 
         view.show(this.profileViews);