[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 3296b190ebf053c8d919e59a71381f78082e218a
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 31 01:25:06 2002 +0000

    	3135025 - Assertion failure in _transitionToCommitted on espn nba scoreboard
    
    	For blank pages we decided that there would be no b/f entry.  This means that
    	subframes within such pages (created via doc.write()), should not try to make
    	WebHistoryItems, since they have no parent items to attach them to.
    
            Reviewed by Darin.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted:]):  Don't make a history item for a subframe
    	it the parent frame has no item.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5e347b9..72a4ffd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
 2002-12-30  Trey Matteson  <trey at apple.com>
 
+	3135025 - Assertion failure in _transitionToCommitted on espn nba scoreboard
+
+	For blank pages we decided that there would be no b/f entry.  This means that
+	subframes within such pages (created via doc.write()), should not try to make
+	WebHistoryItems, since they have no parent items to attach them to.
+
+        Reviewed by Darin.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted:]):  Don't make a history item for a subframe
+	it the parent frame has no item.
+
+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	
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index d932730..ba5c0ad 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -597,8 +597,12 @@ Repeat load of the same URL (by any other means of navigation other than the rel
             case WebFrameLoadTypeInternal:
                 // Add an item to the item tree for this frame
                 ASSERT(![ds _isClientRedirect]);
-                ASSERT([[self parent]->_private currentItem]);
-                [[[self parent]->_private currentItem] addChildItem:[self _createItem]];
+                WebHistoryItem *parentItem = [[self parent]->_private currentItem];
+                // The only case where parentItem==nil should be when a parent frame loaded an
+                // empty URL, which doesn't set up a current item in that parent.
+                if (parentItem) {
+                    [parentItem addChildItem:[self _createItem]];
+                }
                 [self _makeDocumentView];
                 break;
 

-- 
WebKit Debian packaging