[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 4ba64b84f4b00e98fb41fc573a3ba43d882fd6e6
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 17 23:41:22 2002 +0000

            Fixed 3127932.  Added WebFrameLoadTypeReloadAllowingStaleData to cases that do not
            get cached in the b/f cache.
    
            Reviewed by trey.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _setState:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2797a8e..19aaf4b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2002-12-17  Richard Williamson   <rjw at apple.com>
 
+        Fixed 3127932.  Added WebFrameLoadTypeReloadAllowingStaleData to cases that do not
+        get cached in the b/f cache.
+        
+        Reviewed by trey.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]):
+
+2002-12-17  Richard Williamson   <rjw at apple.com>
+
         Fixed 3128794.  Use CG directy to get font metrics rather than the appkit.  The appkit
         has a bug (3129490) that sometimes causes line height to be 20% too large.
         
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 9908197..27c5294 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -701,7 +701,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
             && [_private->bridge canCachePage]
             && item
             && !_private->quickRedirectComing
-            && loadType != WebFrameLoadTypeReload && loadType != WebFrameLoadTypeSame
+            && loadType != WebFrameLoadTypeReload 
+            && loadType != WebFrameLoadTypeReloadAllowingStaleData
+            && loadType != WebFrameLoadTypeSame
             && ![[self dataSource] isLoading]
             && [[[self dataSource] representation] isKindOfClass: [WebHTMLRepresentation class]])
         {

-- 
WebKit Debian packaging