Changeset 202932 in webkit

Timestamp:

Jul 7, 2016, 2:26:33 PM (10 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: scrolled Snapshot list is reset to top and drawn blank after switching back from Snapshot Comparison view
​https://bugs.webkit.org/show_bug.cgi?id=158218
rdar://problem/26545000

Reviewed by Brian Burg.

• UserInterface/Views/ClusterContentView.js:

(WebInspector.ClusterContentView.prototype.get scrollableElements): Added.
A default implementation for all cluster views.

• UserInterface/Views/DOMStorageContentView.js:

(WebInspector.DOMStorageContentView.prototype.get scrollableElements): Deleted.
This was duplicated in the class, removed one.

• UserInterface/Views/HeapAllocationsTimelineView.js:

(WebInspector.HeapAllocationsTimelineView): Initialize _snapshotListScrollTop.
(WebInspector.HeapAllocationsTimelineView.prototype.get scrollableElements): Added. Return elements
based on what is showing.

(WebInspector.HeapAllocationsTimelineView.prototype.showHeapSnapshotList): Restore the scroll position
of the DataGrid after it is added to the view.

(WebInspector.HeapAllocationsTimelineView.prototype.showHeapSnapshotTimelineRecord): Save the scroll position
of the DataGrid before it is removed from the view.

• UserInterface/Views/ScriptClusterTimelineView.js:

(WebInspector.ScriptClusterTimelineView.prototype.get scrollableElements): Deleted. Handled by the base class now.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ClusterContentView.js (modified) (1 diff)
• UserInterface/Views/DOMStorageContentView.js (modified) (1 diff)
• UserInterface/Views/HeapAllocationsTimelineView.js (modified) (4 diffs)
• UserInterface/Views/ScriptClusterTimelineView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-07-07  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: scrolled Snapshot list is reset to top and drawn blank after switching back from Snapshot Comparison view
+        https://bugs.webkit.org/show_bug.cgi?id=158218
+        rdar://problem/26545000
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/ClusterContentView.js:
+        (WebInspector.ClusterContentView.prototype.get scrollableElements): Added.
+        A default implementation for all cluster views.
+
+        * UserInterface/Views/DOMStorageContentView.js:
+        (WebInspector.DOMStorageContentView.prototype.get scrollableElements): Deleted.
+        This was duplicated in the class, removed one.
+
+        * UserInterface/Views/HeapAllocationsTimelineView.js:
+        (WebInspector.HeapAllocationsTimelineView): Initialize _snapshotListScrollTop.
+        (WebInspector.HeapAllocationsTimelineView.prototype.get scrollableElements): Added. Return elements
+        based on what is showing.
+
+        (WebInspector.HeapAllocationsTimelineView.prototype.showHeapSnapshotList): Restore the scroll position
+        of the DataGrid after it is added to the view.
+
+        (WebInspector.HeapAllocationsTimelineView.prototype.showHeapSnapshotTimelineRecord): Save the scroll position
+        of the DataGrid before it is removed from the view.
+
+        * UserInterface/Views/ScriptClusterTimelineView.js:
+        (WebInspector.ScriptClusterTimelineView.prototype.get scrollableElements): Deleted. Handled by the base class now.
+
 2016-07-06  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js

@@ -98 +98 @@
     }
 
+    get scrollableElements()
+    {
+        if (!this._contentViewContainer.currentContentView)
+            return [];
+        return this._contentViewContainer.currentContentView.scrollableElements;
+    }
+
     get selectionPathComponents()
     {

trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js

@@ -118 +118 @@
     }
 
-    get scrollableElements()
-    {
-        if (!this._dataGrid)
-            return [];
-        return [this._dataGrid.scrollContainer];
-    }
-
     // Private
 

trunk/Source/WebInspectorUI/UserInterface/Views/HeapAllocationsTimelineView.js

@@ -78 +78 @@
         this._heapSnapshotDiff = null;
 
+        this._snapshotListScrollTop = 0;
         this._showingSnapshotList = true;
 
@@ -106 +107 @@
     // Public
 
+    get scrollableElements()
+    {
+        if (this._showingSnapshotList)
+            return [this._dataGrid.scrollContainer];
+        if (this._contentViewContainer.currentContentView)
+            return this._contentViewContainer.currentContentView.scrollableElements;
+        return [];
+    }
+
     showHeapSnapshotList()
     {
@@ -119 +129 @@
         this.addSubview(this._dataGrid);
 
+        this._dataGrid.scrollContainer.scrollTop = this._snapshotListScrollTop;
+
         this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
         this.dispatchEventToListeners(WebInspector.ContentView.Event.NavigationItemsDidChange);
@@ -126 +138 @@
     {
         if (this._showingSnapshotList) {
+            this._snapshotListScrollTop = this._dataGrid.scrollContainer.scrollTop;
             this.removeSubview(this._dataGrid);
             this.addSubview(this._contentViewContainer);

trunk/Source/WebInspectorUI/UserInterface/Views/ScriptClusterTimelineView.js

@@ -72 +72 @@
     get currentTime() { return this._contentViewContainer.currentContentView.currentTime; }
     set currentTime(x) { this._contentViewContainer.currentContentView.currentTime = x; }
-    get scrollableElements() { return this._contentViewContainer.currentContentView.scrollableElements; }
     selectRecord(record) { this._contentViewContainer.currentContentView.selectRecord(record); }
     updateFilter(filters) { return this._contentViewContainer.currentContentView.updateFilter(filters); }