Changeset 200947 in webkit

Timestamp:

May 16, 2016, 10:41:41 AM (9 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: Many DataGrid instances do not save/restore their scroll position
​https://bugs.webkit.org/show_bug.cgi?id=157709
rdar://problem/26286090

Reviewed by Brian Burg.

• UserInterface/Models/BackForwardEntry.js:

(WebInspector.BackForwardEntry.prototype.makeCopy): Added.

• UserInterface/Views/ContentViewContainer.js:

(WebInspector.ContentViewContainer.prototype.showContentView): Copy the last entry for the view.

• UserInterface/Views/DOMStorageContentView.js:

(WebInspector.DOMStorageContentView.prototype.get scrollableElements): Added.

• UserInterface/Views/HeapSnapshotContentView.js:

(WebInspector.HeapSnapshotContentView.prototype.get scrollableElements): Added.

• UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:

(WebInspector.IndexedDatabaseObjectStoreContentView.prototype.get scrollableElements): Added.

• UserInterface/Views/MemoryTimelineView.js:

(WebInspector.MemoryTimelineView.prototype.get scrollableElements): Added.

• UserInterface/Views/ProfileView.js:

(WebInspector.ProfileView.prototype.get scrollableElements): Added.
(WebInspector.ProfileView.prototype._repopulateDataGridFromTree): Removed unused skipRefresh argument.

• UserInterface/Views/ScriptClusterTimelineView.js:

(WebInspector.ScriptClusterTimelineView.prototype.get scrollableElements): Added.

• UserInterface/Views/ScriptProfileTimelineView.js:

(WebInspector.ScriptProfileTimelineView.prototype.get scrollableElements): Added.

• UserInterface/Views/TimelineView.js:

(WebInspector.TimelineView.prototype.get scrollableElements): Added.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/BackForwardEntry.js (modified) (1 diff)
• UserInterface/Views/ContentViewContainer.js (modified) (3 diffs)
• UserInterface/Views/DOMStorageContentView.js (modified) (1 diff)
• UserInterface/Views/HeapSnapshotContentView.js (modified) (1 diff)
• UserInterface/Views/IndexedDatabaseObjectStoreContentView.js (modified) (1 diff)
• UserInterface/Views/MemoryTimelineView.js (modified) (1 diff)
• UserInterface/Views/ProfileView.js (modified) (2 diffs)
• UserInterface/Views/ScriptClusterTimelineView.js (modified) (1 diff)
• UserInterface/Views/ScriptProfileTimelineView.js (modified) (1 diff)
• UserInterface/Views/TimelineView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog ¶

@@ +1 @@
+2016-05-14  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: Many DataGrid instances do not save/restore their scroll position
+        https://bugs.webkit.org/show_bug.cgi?id=157709
+        rdar://problem/26286090
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Models/BackForwardEntry.js:
+        (WebInspector.BackForwardEntry.prototype.makeCopy): Added.
+        * UserInterface/Views/ContentViewContainer.js:
+        (WebInspector.ContentViewContainer.prototype.showContentView): Copy the last entry for the view.
+        * UserInterface/Views/DOMStorageContentView.js:
+        (WebInspector.DOMStorageContentView.prototype.get scrollableElements): Added.
+        * UserInterface/Views/HeapSnapshotContentView.js:
+        (WebInspector.HeapSnapshotContentView.prototype.get scrollableElements): Added.
+        * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
+        (WebInspector.IndexedDatabaseObjectStoreContentView.prototype.get scrollableElements): Added.
+        * UserInterface/Views/MemoryTimelineView.js:
+        (WebInspector.MemoryTimelineView.prototype.get scrollableElements): Added.
+        * UserInterface/Views/ProfileView.js:
+        (WebInspector.ProfileView.prototype.get scrollableElements): Added.
+        (WebInspector.ProfileView.prototype._repopulateDataGridFromTree): Removed unused skipRefresh argument.
+        * UserInterface/Views/ScriptClusterTimelineView.js:
+        (WebInspector.ScriptClusterTimelineView.prototype.get scrollableElements): Added.
+        * UserInterface/Views/ScriptProfileTimelineView.js:
+        (WebInspector.ScriptProfileTimelineView.prototype.get scrollableElements): Added.
+        * UserInterface/Views/TimelineView.js:
+        (WebInspector.TimelineView.prototype.get scrollableElements): Added.
+
 2016-05-14  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/BackForwardEntry.js ¶

@@ -46 +46 @@
 
     // Public
+
+    makeCopy(newCookie)
+    {
+        let copy = new WebInspector.BackForwardEntry(this._contentView, newCookie || this.cookie);
+        copy._tombstone = this._tombstone;
+        copy._scrollPositions = this._scrollPositions.slice();
+        return copy;
+    }
 
     get contentView()

trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js ¶

@@ -89 +89 @@
             this._takeOwnershipOfContentView(contentView);
 
-        var currentEntry = this.currentBackForwardEntry;
-        var provisionalEntry = new WebInspector.BackForwardEntry(contentView, cookie);
+        let currentEntry = this.currentBackForwardEntry;
+
+        // Try to find the last entry with the same content view so we can copy it
+        // to preserve the last scroll positions. The supplied cookie (if any) could
+        // still change the scroll position afterwards, but in most cases the cookie
+        // is undefined, so we want to show with a state last used.
+        let provisionalEntry = null;
+        for (let i = this._backForwardList.length - 1; i >= 0; --i) {
+            if (this._backForwardList[i].contentView === contentView) {
+                provisionalEntry = this._backForwardList[i].makeCopy(cookie);
+                break;
+            }
+        }
+
+        if (!provisionalEntry)
+            provisionalEntry = new WebInspector.BackForwardEntry(contentView, cookie);
+
         // Don't do anything if we would have added an identical back/forward list entry.
         if (currentEntry && currentEntry.contentView === contentView && Object.shallowEqual(provisionalEntry.cookie, currentEntry.cookie)) {
@@ -102 +117 @@
 
         // Increment the current index to where we will insert the content view.
-        var newIndex = this._currentIndex + 1;
+        let newIndex = this._currentIndex + 1;
 
         // Insert the content view at the new index. This will remove any content views greater than or equal to the index.
-        var removedEntries = this._backForwardList.splice(newIndex, this._backForwardList.length - newIndex, provisionalEntry);
+        let removedEntries = this._backForwardList.splice(newIndex, this._backForwardList.length - newIndex, provisionalEntry);
 
         console.assert(newIndex === this._backForwardList.length - 1);
@@ -111 +126 @@
 
         // Disassociate with the removed content views.
-        for (var i = 0; i < removedEntries.length; ++i) {
+        for (let i = 0; i < removedEntries.length; ++i) {
             // Skip disassociation if this content view is still in the back/forward list.
-            var shouldDissociateContentView = !this._backForwardList.some(function(existingEntry) {
+            let shouldDissociateContentView = !this._backForwardList.some(function(existingEntry) {
                 return existingEntry.contentView === removedEntries[i].contentView;
             });

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

@@ -61 +61 @@
     }
 
+    get scrollableElements()
+    {
+        return [this._dataGrid.scrollContainer];
+    }
+
     itemsCleared(event)
     {

trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotContentView.js ¶

@@ -64 +64 @@
 
         this._heapSnapshotDataGridTree.hidden();
+    }
+
+    get scrollableElements()
+    {
+        return [this._dataGrid.scrollContainer];
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js ¶

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

trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js ¶

@@ -152 +152 @@
     }
 
+    get scrollableElements()
+    {
+        return [this.element];
+    }
+
     // Protected
 

trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.js ¶

@@ -108 +108 @@
     }
 
+    get scrollableElements()
+    {
+        return [this._dataGrid.scrollContainer];
+    }
+
     // Protected
 
@@ -143 +148 @@
     }
 
-    _repopulateDataGridFromTree(skipRefresh)
+    _repopulateDataGridFromTree()
     {
         this._dataGrid.removeChildren();

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); }

trunk/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js ¶

@@ -62 +62 @@
 
     // Public
+
+    get scrollableElements() { return this._profileView.scrollableElements; }
 
     get showsLiveRecordingData() { return false; }

trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js ¶

@@ -44 +44 @@
     // Public
 
+    get scrollableElements()
+    {
+        if (!this._timelineDataGrid)
+            return [];
+        return [this._timelineDataGrid.scrollContainer];
+    }
+
     get showsLiveRecordingData()
     {