[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 e4644f103c32aadafcb82c121488d1c6ade558ec
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Mar 31 03:25:50 2002 +0000

            Corrected comments describing the new 'acceptable to layout' state
            transition.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5b8dc69..708996b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-30  Richard Williamson  <rjw at apple.com>
+
+        Corrected comments describing the new 'acceptable to layout' state
+        transition.
+        
+	* WebView.subproj/IFBaseWebControllerPrivate.mm: (-[IFBaseWebController
+	_mainReceivedProgress:forResource:fromDataSource:]):
+
 2002-03-30  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFBaseWebController.mm:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5b8dc69..708996b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-03-30  Richard Williamson  <rjw at apple.com>
+
+        Corrected comments describing the new 'acceptable to layout' state
+        transition.
+        
+	* WebView.subproj/IFBaseWebControllerPrivate.mm: (-[IFBaseWebController
+	_mainReceivedProgress:forResource:fromDataSource:]):
+
 2002-03-30  Darin Adler  <darin at apple.com>
 
 	* WebView.subproj/IFBaseWebController.mm:
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index f58b707..2514855 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -74,6 +74,7 @@
         return;
     }
 
+    // The frame may be nil if a previously cancelled load is still making progress callbacks.
     if (frame == nil)
         return;
         
@@ -86,12 +87,15 @@
 
     // This resouce has completed, so check if the load is complete for all frames.
     if (progress->bytesSoFar == progress->totalToLoad){
+        // If the load is complete, make the primary load as done.  The primary load is the load
+        // of the main document.  Other resources may still be arriving.
         [dataSource _setPrimaryLoadComplete: YES];
         [frame _checkLoadCompleteResource: resourceDescription error: nil  isMainDocument: YES];
     }
     else {
-        // If the load is complete, make the primary load as done.  The primary load is the load
-        // of the main document.  Other resources may still be arriving.
+        // If the frame isn't complete is might be ready for a layout.  Perform that check here.
+        // Note that transitioning a frame to this state doesn't guarantee a layout, rather it
+        // just indicates that an early layout can be performed.
         int timedLayoutSize = [[IFPreferences standardPreferences] _initialTimedLayoutSize];
         if (progress->bytesSoFar > timedLayoutSize)
             [frame _transitionProvisionalToLayoutAcceptable];

-- 
WebKit Debian packaging