[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 0bd844a9493e86b2e4df8c613d5278fff04c24e7
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 13 22:08:35 2002 +0000

    	3108976 - assert _private provisionalItem in -[WebFrame(WebPrivate) _transitionToCommitted
    	3108865 - frames not maintained going back at directory.apple.com
    
    	Both bugs are fixed by the same small change.  We no longer try to inherit loadType
    	across redirects.  Instead we just make sure the right thing happens in _transitionToCommitted:
    	for redirects in the loadType=Standard case.
    
    	3122721 - History stores both original and redirected sites
    
    	Easy fix while in the neighborhood.  We just don't add to History when doing a redirect.
    
            Reviewed by rjw
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted:]):  On redirect, update the URL of the frame's current
    	item, not the current item in the b/f list.  Also do not add to history on redirect.
            (-[WebFrame _loadURL:loadType:triggeringEvent:isFormSubmission:]):  Cut out funny business
    	that tried to guess when to inherit loadtype across redirects.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index da5e5a0..7031a81 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2002-12-13  Trey Matteson  <trey at apple.com>
+
+	3108976 - assert _private provisionalItem in -[WebFrame(WebPrivate) _transitionToCommitted
+	3108865 - frames not maintained going back at directory.apple.com
+
+	Both bugs are fixed by the same small change.  We no longer try to inherit loadType
+	across redirects.  Instead we just make sure the right thing happens in _transitionToCommitted:
+	for redirects in the loadType=Standard case.
+
+	3122721 - History stores both original and redirected sites
+
+	Easy fix while in the neighborhood.  We just don't add to History when doing a redirect.
+
+        Reviewed by rjw
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted:]):  On redirect, update the URL of the frame's current
+	item, not the current item in the b/f list.  Also do not add to history on redirect.
+        (-[WebFrame _loadURL:loadType:triggeringEvent:isFormSubmission:]):  Cut out funny business
+	that tried to guess when to inherit loadtype across redirects.
+
 2002-12-13  Richard Williamson   <rjw at apple.com>
 
         Fixed 3127225.  Scale page cache based on available memory.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 351fe69..9908197 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -560,16 +560,16 @@ Repeat load of the same URL (by any other means of navigation other than the rel
             }
 
             case WebFrameLoadTypeStandard:
-                // Add item to history.
-                entry = [[WebHistory sharedHistory] addEntryForURL: [[[ds _originalRequest] URL] _web_canonicalize]];
-                if (ptitle)
-                    [entry setTitle: ptitle];
-
                 if (![ds _isClientRedirect]) {
+                    // Add item to history.
+                    entry = [[WebHistory sharedHistory] addEntryForURL: [[[ds _originalRequest] URL] _web_canonicalize]];
+                    if (ptitle)
+                        [entry setTitle: ptitle];
+
                     [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]];
+                    [[_private currentItem] setURL:[[ds request] URL]];
                 }
                 [[self webView] _makeDocumentViewForDataSource:ds];
                 break;
@@ -577,6 +577,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
             case WebFrameLoadTypeInternal:
                 {  // braces because the silly compiler lets you declare vars everywhere but here?!
                 // Add an item to the item tree for this frame
+                ASSERT(![ds _isClientRedirect]);
                 WebHistoryItem *item = [self _createItem];
                 ASSERT([[self parent]->_private currentItem]);
                 [[[self parent]->_private currentItem] addChildItem:item];
@@ -1400,21 +1401,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         [self _checkNavigationPolicyForRequest:request dataSource:oldDataSource
             andCall:self withSelector:@selector(_continueFragmentScrollAfterNavigationPolicy:request:)];
     } else {
-        WebFrameLoadType previousLoadType = [self _loadType];
-
         [self _loadRequest:request triggeringAction:action loadType:loadType];
         if (_private->quickRedirectComing) {
             _private->quickRedirectComing = NO;
             
-            // Inherit the loadType from the operation that spawned the redirect,
-            // unless the new load type is some kind of reload imposed by WebKit.
-            if (loadType != WebFrameLoadTypeReload
-                && loadType != WebFrameLoadTypeSame
-                && loadType != WebFrameLoadTypeReloadAllowingStaleData)
-            {
-                [self _setLoadType:previousLoadType];
-            }
-
             // need to transfer BF items from the dataSource that we're replacing
             WebDataSource *newDataSource = [self provisionalDataSource];
             [newDataSource _setIsClientRedirect:YES];

-- 
WebKit Debian packaging