[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 33466077f9f2d4364113893c0bf22587a9663c3d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 17 23:28:10 2003 +0000

            Reviewed by Chris and Richard.
    
            - fixed 3200611 -- Progress indicator in tabs not shown for subframe loads
    
            * WebView.subproj/WebDataSource.m: (-[WebDataSource isLoading]):
            Remove the early out for when we're in the WebFrameStateComplete state.
            The top frame being complete does not really tell us anything about whether subframes
            are complete, especially since they can have their locations changed without affecting
            the top level frame at all.
    
            * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 87a8de3..2889d04 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-03-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris and Richard.
+
+        - fixed 3200611 -- Progress indicator in tabs not shown for subframe loads
+
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource isLoading]):
+        Remove the early out for when we're in the WebFrameStateComplete state.
+        The top frame being complete does not really tell us anything about whether subframes
+        are complete, especially since they can have their locations changed without affecting
+        the top level frame at all.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
+
 2003-03-17  Chris Blumenberg  <cblu at apple.com>
 
 	Made data categories use the "_web_" prefix.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index e4f439e..b4d6d21 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -6,6 +6,7 @@
 "%@ %@"
 "%@-%d"
 "%@/%@"
+"%@:%u"
 "%d"
 "%lf"
 "(This file must be converted with BinHex 4.0)"
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 14e8a55..e81aa62 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -82,17 +82,6 @@
 // Returns YES if there are any pending loads.
 - (BOOL)isLoading
 {
-    // FIXME: This comment says that the state check is just an optimization, but that's
-    // not true. There's a window where the state is complete, but primaryLoadComplete
-    // is still NO and loading is still YES, because _setPrimaryLoadComplete has not yet
-    // been called. We should fix that and simplify this code here.
-    
-    // As an optimization, check to see if the frame is in the complete state.
-    // If it is, we aren't loading, so we don't have to check all the child frames.    
-    if ([[self webFrame] _state] == WebFrameStateComplete) {
-        return NO;
-    }
-    
     if (!_private->primaryLoadComplete && _private->loading) {
         return YES;
     }

-- 
WebKit Debian packaging