[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[trey]

The following commit has been merged in the debian/unstable branch:
commit c854feb083595969be82cc101c48c636ea6faacc
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 11 19:27:33 2002 +0000

            Fixed 3015884 - Reloading a page should remember the scroll position
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted]):  Save scroll position on reload
            (-[WebFrame _isLoadComplete]):  Restore position on reload
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2626 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 797f4ea..4b0c19a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-11-11  Trey Matteson  <trey at apple.com>
 
+        Fixed 3015884 - Reloading a page should remember the scroll position
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):  Save scroll position on reload
+        (-[WebFrame _isLoadComplete]):  Restore position on reload
+
+2002-11-11  Trey Matteson  <trey at apple.com>
+
         * History.subproj/WebBackForwardList.m:
         (-[WebBackForwardList addEntry:]):  Yank code to avoid adding a duplicate entry, to catch the
 	refresh case.  That's dealt with in WebFramePrivate now.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 797f4ea..4b0c19a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-11  Trey Matteson  <trey at apple.com>
 
+        Fixed 3015884 - Reloading a page should remember the scroll position
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):  Save scroll position on reload
+        (-[WebFrame _isLoadComplete]):  Restore position on reload
+
+2002-11-11  Trey Matteson  <trey at apple.com>
+
         * History.subproj/WebBackForwardList.m:
         (-[WebBackForwardList addEntry:]):  Yank code to avoid adding a duplicate entry, to catch the
 	refresh case.  That's dealt with in WebFramePrivate now.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 23d100b..b39ab96 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -444,7 +444,7 @@ static const char * const stateNames[] = {
                     break;
                     
                 case WebFrameLoadTypeReload:
-                    [self _scrollToTop];
+                    [self _saveScrollPositionToItem:[_private currentItem]];
                     break;
     
                 case WebFrameLoadTypeStandard:
@@ -629,13 +629,10 @@ static const char * const stateNames[] = {
                     case WebFrameLoadTypeForward:
                     case WebFrameLoadTypeBack:
                     case WebFrameLoadTypeIndexedBackForward:
-                        [self _restoreScrollPosition];
-                        break;
-                        
                     case WebFrameLoadTypeReload:
-                        [self _scrollToTop];
+                        [self _restoreScrollPosition];
                         break;
-        
+
                     case WebFrameLoadTypeStandard:
                     case WebFrameLoadTypeInternal:
                     case WebFrameLoadTypeReloadAllowingStaleData:

-- 
WebKit Debian packaging