[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 5c764a8066082d4c07f7bc008aae53559ea18a38
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 20 21:51:05 2002 +0000

    	3131841 - crash when switching encodings on a page with frames
    
            Reviewed by rjw
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted:]):  Create a docView in the LoadStale case, like
    	every other kind of load does.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5ddefce..45e16b2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-20  Trey Matteson  <trey at apple.com>
+
+	3131841 - crash when switching encodings on a page with frames
+
+        Reviewed by rjw
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted:]):  Create a docView in the LoadStale case, like
+	every other kind of load does.
+
 2002-12-20  Richard Williamson   <rjw at apple.com>
 
         Fixed 3133261.  This fix really has two parts.  This first part
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 5f8c440..fa1cec8 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -551,6 +551,7 @@ Repeat load of the same URL (by any other means of navigation other than the rel
             {
                 WebHistoryItem *currItem = [_private currentItem];
                 LOG(PageCache, "Clearing back/forward cache, %s\n", [[[currItem URL] absoluteString] cString]);
+                // FIXME: rjw sez this cache clearing is no longer needed
                 [currItem setHasPageCache:NO];
                 if (loadType == WebFrameLoadTypeReload) {
                     [self _saveScrollPositionToItem:currItem];
@@ -588,7 +589,9 @@ Repeat load of the same URL (by any other means of navigation other than the rel
                 }
                 break;
 
+            // FIXME - just get rid of this case, and merge WebFrameLoadTypeReloadAllowingStaleData with one of the other reload types
             case WebFrameLoadTypeReloadAllowingStaleData:
+                [[self webView] _makeDocumentViewForDataSource:ds];
                 break;
                 
             // FIXME Remove this check when dummy ds is removed.  An exception should be thrown

-- 
WebKit Debian packaging