[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 345bce1542e75e0d13dcb3cdd5dfcc720bb94e05
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 19 01:13:40 2002 +0000

            Fixed 3129951.  Don't allow pages that are stopping to enter the page cache.
            (Fixed yesterday, forgot to checkin.)
    
            Reviewed by trey.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _setState:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 740afd8..07f4e0a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-18  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3129951.  Don't allow pages that are stopping to enter the page cache.
+        (Fixed yesterday, forgot to checkin.)
+         
+        Reviewed by trey.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _setState:]):
+
 2002-12-18  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin and Trey.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 414a4d4..5519bbf 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -708,6 +708,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
             && loadType != WebFrameLoadTypeReloadAllowingStaleData
             && loadType != WebFrameLoadTypeSame
             && ![[self dataSource] isLoading]
+            && ![[self dataSource] _isStopping]
             && [[[self dataSource] representation] isKindOfClass: [WebHTMLRepresentation class]])
         {
             if (![item pageCache]){
@@ -864,7 +865,6 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
  
                 //if ([ds isDocumentHTML])
                 //    [[ds representation] part]->closeURL();        
-               
                 return;
             }
             // A resource was loaded, but the entire frame isn't complete.  Schedule a

-- 
WebKit Debian packaging