[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 f8dec244e0f392492652e671bc6db74b1afc4cc1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 18 19:52:22 2002 +0000

            Check for usesBackForwardList was excluding all load types.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7d37d27..8d97cf0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-18  Richard Williamson   <rjw at apple.com>
+
+        Check for usesBackForwardList was excluding all load types.
+        
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):
+
 2002-11-18  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3098767 - REGRESSION: standalone quicktime content just shows blank window
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7d37d27..8d97cf0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-18  Richard Williamson   <rjw at apple.com>
+
+        Check for usesBackForwardList was excluding all load types.
+        
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted]):
+
 2002-11-18  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3098767 - REGRESSION: standalone quicktime content just shows blank window
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 4e8533b..50fc345 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -435,57 +435,57 @@ static const char * const stateNames[] = {
             WebHistoryItem *entry = nil;
             NSString *ptitle = [ds pageTitle];
 
-            if ([[self controller] usesBackForwardList]) {
-                switch (loadType) {
-                case WebFrameLoadTypeForward:
-                case WebFrameLoadTypeBack:
-                case WebFrameLoadTypeIndexedBackForward:
+            switch (loadType) {
+            case WebFrameLoadTypeForward:
+            case WebFrameLoadTypeBack:
+            case WebFrameLoadTypeIndexedBackForward:
+                if ([[self controller] usesBackForwardList]) {
                     // Must grab the current scroll position before disturbing it
                     [self _saveScrollPositionToItem:[_private previousItem]];
                     [[self webView] _makeDocumentViewForDataSource:ds];
                     // FIXME - I'm not sure this call does anything.  Should be dealt with as
                     // part of 3024377
                     [self _restoreScrollPosition];
-                    break;
-                    
-                case WebFrameLoadTypeReload:
-                    [self _saveScrollPositionToItem:[_private currentItem]];
-                    [[self webView] _makeDocumentViewForDataSource:ds];
-                    break;
-    
-                case WebFrameLoadTypeStandard:
-                    // Add item to history.
-                    entry = [[WebHistory sharedHistory] addEntryForURL: [[[ds _originalRequest] URL] _web_canonicalize]];
-                    if (ptitle)
-                        [entry setTitle: ptitle];
-
-                    if (![ds _isClientRedirect]) {
-                        [self _addBackForwardItemClippedAtTarget:YES];
-                    } else {
-                        // update the URL in the BF list that we made before the redirect
-                        [[[[self controller] backForwardList] currentEntry] setURL:[[ds request] URL]];
-                    }
-                    [[self webView] _makeDocumentViewForDataSource:ds];
-                    break;
-                    
-                case WebFrameLoadTypeInternal:
-                    {  // braces because the silly compiler lets you declare vars everywhere but here?!
-                    // Add an item to the item tree for this frame
-                    WebHistoryItem *item = [self _createItem];
-                    ASSERT([[self parent]->_private currentItem]);
-                    [[[self parent]->_private currentItem] addChildItem:item];
-                    [[self webView] _makeDocumentViewForDataSource:ds];
-                    }
-                    break;
-
-                case WebFrameLoadTypeReloadAllowingStaleData:
-                    break;
-                    
-                // FIXME Remove this check when dummy ds is removed.  An exception should be thrown
-                // if we're in the WebFrameLoadTypeUninitialized state.
-                default:
-                    ASSERT_NOT_REACHED();
                 }
+                break;
+                
+            case WebFrameLoadTypeReload:
+                [self _saveScrollPositionToItem:[_private currentItem]];
+                [[self webView] _makeDocumentViewForDataSource:ds];
+                break;
+
+            case WebFrameLoadTypeStandard:
+                // Add item to history.
+                entry = [[WebHistory sharedHistory] addEntryForURL: [[[ds _originalRequest] URL] _web_canonicalize]];
+                if (ptitle)
+                    [entry setTitle: ptitle];
+
+                if (![ds _isClientRedirect]) {
+                    [self _addBackForwardItemClippedAtTarget:YES];
+                } else {
+                    // update the URL in the BF list that we made before the redirect
+                    [[[[self controller] backForwardList] currentEntry] setURL:[[ds request] URL]];
+                }
+                [[self webView] _makeDocumentViewForDataSource:ds];
+                break;
+                
+            case WebFrameLoadTypeInternal:
+                {  // braces because the silly compiler lets you declare vars everywhere but here?!
+                // Add an item to the item tree for this frame
+                WebHistoryItem *item = [self _createItem];
+                ASSERT([[self parent]->_private currentItem]);
+                [[[self parent]->_private currentItem] addChildItem:item];
+                [[self webView] _makeDocumentViewForDataSource:ds];
+                }
+                break;
+
+            case WebFrameLoadTypeReloadAllowingStaleData:
+                break;
+                
+            // FIXME Remove this check when dummy ds is removed.  An exception should be thrown
+            // if we're in the WebFrameLoadTypeUninitialized state.
+            default:
+                ASSERT_NOT_REACHED();
             }
 
             

-- 
WebKit Debian packaging