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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5a82287bfb2ccf70cd14ff62e2a81aa371cf6f52
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 6 00:58:43 2002 +0000

            Correctly save of document state in current
            document when going back.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge saveDocumentState:]):
            (-[WebBridge documentState]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1976 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b5f4758..839a67d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
 
+        Correctly save of document state in current
+        document when going back.
+        
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge saveDocumentState:]):
+        (-[WebBridge documentState]):
+
+2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
+
         Fixed 3043505.  Disallows drag drops on originating view.
         
         * WebView.subproj/WebView.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b5f4758..839a67d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
 
+        Correctly save of document state in current
+        document when going back.
+        
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge saveDocumentState:]):
+        (-[WebBridge documentState]):
+
+2002-09-05  Richard Williamson (Local)  <rjw at apple.com>
+
         Fixed 3043505.  Disallows drag drops on originating view.
         
         * WebView.subproj/WebView.m:
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 6097bfc..8b857c9 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -302,10 +302,14 @@
 
 - (void)saveDocumentState: (NSArray *)documentState
 {
-    WebHistoryItem *backItem;
+    WebHistoryItem *item;
     
-    backItem = [[[frame controller] backForwardList] backEntry];
-    [backItem setDocumentState: documentState];
+    if ([frame _loadType] == WebFrameLoadTypeBack)
+        item = [[[frame controller] backForwardList] forwardEntry];
+    else
+        item = [[[frame controller] backForwardList] backEntry];
+
+    [item setDocumentState: documentState];
 }
 
 - (NSArray *)documentState
@@ -313,6 +317,7 @@
     WebHistoryItem *currentItem;
     
     currentItem = [[[frame controller] backForwardList] currentEntry];
+    
     return [currentItem documentState];
 }
 

-- 
WebKit Debian packaging