[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 bdfd3bbbe78e30427e721c70c2638fd1c60a6ab3
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 22 18:34:12 2002 +0000

        Changed semantics of isLoading to only return YES if
        the datasource is loading resources related to the intial
        load.  Other resources loaded later by JS will not be
        accounted for by isLoading.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1194 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 30a885d..86bedf1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-22  Richard J. Williamson  <rjw at apple.com>
+
+    Changed semantics of isLoading to only return YES if
+    the datasource is loading resources related to the intial
+    load.  Other resources loaded later by JS will not be
+    accounted for by isLoading.
+    
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource isLoading]):
+
 2002-05-22  Chris Blumenberg  <cblu at apple.com>
 
 	- Removed obsolete MIME/download related code.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 30a885d..86bedf1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-05-22  Richard J. Williamson  <rjw at apple.com>
+
+    Changed semantics of isLoading to only return YES if
+    the datasource is loading resources related to the intial
+    load.  Other resources loaded later by JS will not be
+    accounted for by isLoading.
+    
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource isLoading]):
+
 2002-05-22  Chris Blumenberg  <cblu at apple.com>
 
 	- Removed obsolete MIME/download related code.
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index f221e64..1ee207c 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -8,7 +8,7 @@
 #import <WebKit/IFException.h>
 #import <WebKit/WebKitDebug.h>
 #import <WebKit/IFWebController.h>
-#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebFramePrivate.h>
 #import <WebFoundation/WebFoundation.h>
 
 #import <xml/dom_docimpl.h>
@@ -205,6 +205,10 @@ static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
 {
     int i, count;
     
+    // First check to see if the datasource's frame is in the complete state
+    if ([[self webFrame] _state] == IFWEBFRAMESTATE_COMPLETE)
+        return NO;
+        
     //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
     if (_private->primaryLoadComplete == NO)
         return YES;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index f221e64..1ee207c 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -8,7 +8,7 @@
 #import <WebKit/IFException.h>
 #import <WebKit/WebKitDebug.h>
 #import <WebKit/IFWebController.h>
-#import <WebKit/IFWebFrame.h>
+#import <WebKit/IFWebFramePrivate.h>
 #import <WebFoundation/WebFoundation.h>
 
 #import <xml/dom_docimpl.h>
@@ -205,6 +205,10 @@ static id IFWebDataSourceMake(void *url, void *attributes, unsigned flags)
 {
     int i, count;
     
+    // First check to see if the datasource's frame is in the complete state
+    if ([[self webFrame] _state] == IFWEBFRAMESTATE_COMPLETE)
+        return NO;
+        
     //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
     if (_private->primaryLoadComplete == NO)
         return YES;

-- 
WebKit Debian packaging