Changeset 92212 in webkit

Timestamp:

Aug 2, 2011 11:32:46 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: SourceFrame should store saved scroll positions in View.
​https://bugs.webkit.org/show_bug.cgi?id=65472

Reviewed by Pavel Feldman.

• inspector/front-end/ResourcesPanel.js:

(WebInspector.FrameResourceTreeElement.prototype._recreateSourceView):

• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._sourceFileChanged):

• inspector/front-end/SourceFrame.js:

(WebInspector.SourceFrame.prototype.show):
(WebInspector.SourceFrame.prototype.hide):
(WebInspector.SourceFrame.prototype.get scrollLeft):
(WebInspector.SourceFrame.prototype.set scrollLeft):
(WebInspector.SourceFrame.prototype.get scrollTop):
(WebInspector.SourceFrame.prototype.set scrollTop):

• inspector/front-end/View.js:

(WebInspector.View.prototype._innerShow):
(WebInspector.View.prototype._innerHide):
(WebInspector.View.prototype.detach):
(WebInspector.View.prototype.storeScrollPositions):
(WebInspector.View.prototype.inheritScrollPositionsFromView):
(WebInspector.View.prototype.restoreScrollPositions):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ResourcesPanel.js (modified) (2 diffs)
• inspector/front-end/ScriptsPanel.js (modified) (1 diff)
• inspector/front-end/SourceFrame.js (modified) (3 diffs)
• inspector/front-end/View.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: SourceFrame should store saved scroll positions in View.
+        https://bugs.webkit.org/show_bug.cgi?id=65472
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.FrameResourceTreeElement.prototype._recreateSourceView):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._sourceFileChanged):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype.show):
+        (WebInspector.SourceFrame.prototype.hide):
+        (WebInspector.SourceFrame.prototype.get scrollLeft):
+        (WebInspector.SourceFrame.prototype.set scrollLeft):
+        (WebInspector.SourceFrame.prototype.get scrollTop):
+        (WebInspector.SourceFrame.prototype.set scrollTop):
+        * inspector/front-end/View.js:
+        (WebInspector.View.prototype._innerShow):
+        (WebInspector.View.prototype._innerHide):
+        (WebInspector.View.prototype.detach):
+        (WebInspector.View.prototype.storeScrollPositions):
+        (WebInspector.View.prototype.inheritScrollPositionsFromView):
+        (WebInspector.View.prototype.restoreScrollPositions):
+
 2011-08-02  Jeff Miller  <jeffm@apple.com>
 

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

@@ -1400 +1400 @@
 
         var oldViewParentNode = oldView.visible ? oldView.element.parentNode : null;
-        var scrollTop = oldView.scrollTop;
+        newView.inheritScrollPositionsFromView(oldView);
 
         this._sourceView.detach();
@@ -1407 +1407 @@
         if (oldViewParentNode)
             newView.show(oldViewParentNode);
-        if (scrollTop)
-            newView.scrollTop = scrollTop;
 
         return newView;

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

@@ -653 +653 @@
 
         var newSourceFrame = this._createSourceFrame(sourceFileId)
-        newSourceFrame.scrollTop = oldSourceFrame.scrollTop;
+        newSourceFrame.inheritScrollPositionsFromView(oldSourceFrame);
         this.visibleView = newSourceFrame;
     },

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

@@ -84 +84 @@
 
         this._ensureContentLoaded();
-
-        if (this.loaded) {
-            if (this._scrollTop)
-                this._textViewer.scrollTop = this._scrollTop;
-            if (this._scrollLeft)
-                this._textViewer.scrollLeft = this._scrollLeft;
-        }
+        
+        this.restoreScrollPositions();
+
         // Resize after setting the initial scroll positions to avoid unnecessary rendering work.
         this._textViewer.resize();
@@ -99 +95 @@
         WebInspector.View.prototype.hide.call(this);
 
-        if (this.loaded) {
-            this._scrollTop = this._textViewer.scrollTop;
-            this._scrollLeft = this._textViewer.scrollLeft;
+        if (this.loaded)
             this._textViewer.freeCachedElements();
-        }
 
         this._textViewer.hide();
@@ -169 +162 @@
     },
 
+    get scrollLeft()
+    {
+        return this.loaded ? this._textViewer.scrollLeft : 0;
+    },
+
+    set scrollLeft(scrollLeft)
+    {
+        if (this.loaded)
+            this._textViewer.scrollLeft = scrollLeft;
+    },
+
     get scrollTop()
     {
-        return this.loaded ? this._textViewer.scrollTop : this._scrollTop;
+        return this.loaded ? this._textViewer.scrollTop : 0;
     },
 
     set scrollTop(scrollTop)
     {
-        this._scrollTop = scrollTop;
         if (this.loaded)
             this._textViewer.scrollTop = scrollTop;

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

@@ -51 +51 @@
     {
         this.element.addStyleClass("visible");
+        this.restoreScrollPositions();
     },
 
@@ -67 +68 @@
     _innerHide: function()
     {
+        this.storeScrollPositions();
         this.element.removeStyleClass("visible");
     },
@@ -80 +82 @@
         if (this.element.parentNode)
             this.element.parentNode.removeChild(this.element);
+    },
+
+    storeScrollPositions: function()
+    {
+        this._scrollLeft = this.scrollLeft;
+        this._scrollTop = this.scrollTop;
+    },
+    
+    inheritScrollPositionsFromView: function(view)
+    {
+        this._scrollLeft = view._scrollLeft;
+        this._scrollTop = view._scrollTop;
+    },
+
+    restoreScrollPositions: function()
+    {
+        this.scrollLeft = this._scrollLeft;
+        this.scrollTop = this._scrollTop;
     }
 }