[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 c478414362716e2c5e8421ba01d3003a527ac22f
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 30 19:47:06 2002 +0000

    	3135779 - REGRESSION: reproducible assertion failure, going back from ~orubin to the main spies.com page
    	3136218 - REGRESSION: Assertion failure in _restoreScrollPosition running browser buster
    
    	Both were caused by subtle interactions between new code for short-circuiting loading of
    	blank pages, and the WebHistoryItem manipulations we do for b/f and reload of child frames.
    
            Reviewed by Maciej
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadURL:intoChild:]):  Setup provisional or current item before jumping into
    	the real work of loading the URL.
            (-[WebFrame _restoreScrollPosition]):  Tweaked to make the assertion message clearer.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3212 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5c55438..5e347b9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-12-30  Trey Matteson  <trey at apple.com>
+
+	3135779 - REGRESSION: reproducible assertion failure, going back from ~orubin to the main spies.com page	
+	3136218 - REGRESSION: Assertion failure in _restoreScrollPosition running browser buster	
+
+	Both were caused by subtle interactions between new code for short-circuiting loading of
+	blank pages, and the WebHistoryItem manipulations we do for b/f and reload of child frames.
+
+        Reviewed by Maciej
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadURL:intoChild:]):  Setup provisional or current item before jumping into
+	the real work of loading the URL.
+        (-[WebFrame _restoreScrollPosition]):  Tweaked to make the assertion message clearer.
+
 2002-12-30  Darin Adler  <darin at apple.com>
 
         Reviewed by Don and Ken.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 9b67229..d932730 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1476,25 +1476,21 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
             URL = [childItem URL];
             // These behaviors implied by these loadTypes should apply to the child frames
             childLoadType = loadType;
-        }
-    }
-            
-    [childFrame _loadURL:URL loadType:childLoadType triggeringEvent:nil isFormSubmission:NO];
 
-    if (childItem) {
-        // We only enter this second if block when the first one succeeded to find a
-        // matching child frame
-        if (loadType == WebFrameLoadTypeForward
-            || loadType == WebFrameLoadTypeBack
-            || loadType == WebFrameLoadTypeIndexedBackForward)
-        {
-            // For back/forward, remember this item so we can traverse any child items as child frames load
-            [childFrame->_private setProvisionalItem:childItem];
-        } else {
-            // For reload, just reinstall the current item, since a new child frame was created but we won't be creating a new BF item
-            [childFrame->_private setCurrentItem:childItem];
+            if (loadType == WebFrameLoadTypeForward
+                || loadType == WebFrameLoadTypeBack
+                || loadType == WebFrameLoadTypeIndexedBackForward)
+            {
+                // For back/forward, remember this item so we can traverse any child items as child frames load
+                [childFrame->_private setProvisionalItem:childItem];
+            } else {
+                // For reload, just reinstall the current item, since a new child frame was created but we won't be creating a new BF item
+                [childFrame->_private setCurrentItem:childItem];
+            }
         }
     }
+
+    [childFrame _loadURL:URL loadType:childLoadType triggeringEvent:nil isFormSubmission:NO];
 }
 
 - (void)_postWithURL:(NSURL *)URL data:(NSData *)data contentType:(NSString *)contentType triggeringEvent:(NSEvent *)event
@@ -1565,9 +1561,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (void)_restoreScrollPosition
 {
-    WebHistoryItem *entry = [_private currentItem];
-    ASSERT(entry);
-    [[[self webView] documentView] scrollPoint:[entry scrollPoint]];
+    ASSERT([_private currentItem]);
+    [[[self webView] documentView] scrollPoint:[[_private currentItem] scrollPoint]];
 }
 
 - (void)_scrollToTop

-- 
WebKit Debian packaging