[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 9b40a5ef02e7f329795db84e5a65791e1cbf11e3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 8 23:07:45 2002 +0000

    	Forgot to save out files from the editor in my last change.
    
            * WebView.subproj/WebDataSource.m:
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebDataSourcePrivate.m:
    	Oops.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 553e3f0..5d832a0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-09-08  Darin Adler  <darin at apple.com>
 
+	Forgot to save out files from the editor in my last change.
+
+        * WebView.subproj/WebDataSource.m:
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+	Oops.
+
+2002-09-08  Darin Adler  <darin at apple.com>
+
 	Finished weaning us from handleDidCancelLoading. Now I will remove both
 	handleDidBeginLoading and handleDidCancelLoading.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 553e3f0..5d832a0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-09-08  Darin Adler  <darin at apple.com>
 
+	Forgot to save out files from the editor in my last change.
+
+        * WebView.subproj/WebDataSource.m:
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+	Oops.
+
+2002-09-08  Darin Adler  <darin at apple.com>
+
 	Finished weaning us from handleDidCancelLoading. Now I will remove both
 	handleDidBeginLoading and handleDidCancelLoading.
 
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index ef71bba..ad48c46 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -223,7 +223,7 @@
     if (!_private->primaryLoadComplete && _private->loading) {
         return YES;
     }
-    if ([_private->resourceClients count]) {
+    if ([_private->subresourceClients count]) {
 	return YES;
     }
      
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 68af00e..8fa2fec 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -42,7 +42,7 @@
     WebResourceHandle *mainHandle;
     
     // Clients for other resources.
-    NSMutableArray *resourceClients;
+    NSMutableArray *subresourceClients;
 
     // The time when the data source was told to start loading.
     double loadingStartedTime;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 6e68acd..d3df4a5 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -69,7 +69,7 @@
     [frames release];
     [mainClient release];
     [mainHandle release];
-    [resourceClients release];
+    [subresourceClients release];
     [pageTitle release];
     [encoding release];
     [contentType release];
@@ -123,7 +123,7 @@
 
 - (void)_updateLoading
 {
-    [self _setLoading:_private->mainClient || [_private->resourceClients count]];
+    [self _setLoading:_private->mainClient || [_private->subresourceClients count]];
 }
 
 - (void)_setController: (WebController *)controller
@@ -192,19 +192,19 @@
 
 - (void)_addSubresourceClient:(WebSubresourceClient *)client
 {
-    if (_private->resourceClients == nil) {
-        _private->resourceClients = [[NSMutableArray alloc] init];
+    if (_private->subresourceClients == nil) {
+        _private->subresourceClients = [[NSMutableArray alloc] init];
     }
     if ([_private->controller _defersCallbacks]) {
         [[client handle] setDefersCallbacks:YES];
     }
-    [_private->resourceClients addObject:client];
+    [_private->subresourceClients addObject:client];
     [self _setLoading:YES];
 }
 
 - (void)_removeSubresourceClient:(WebSubresourceClient *)client
 {
-    [_private->resourceClients removeObject:client];
+    [_private->subresourceClients removeObject:client];
     [self _updateLoading];
 }
 
@@ -224,7 +224,7 @@
     [_private->mainHandle cancelLoadInBackground];
     [_private->mainClient didCancelWithHandle:_private->mainHandle];
     
-    NSArray *clients = [_private->resourceClients copy];
+    NSArray *clients = [_private->subresourceClients copy];
     [clients makeObjectsPerformSelector:@selector(cancel)];
     [clients release];
 
@@ -505,7 +505,7 @@
 
     _private->defersCallbacks = defers;
     [_private->mainHandle setDefersCallbacks:defers];
-    NSEnumerator *e = [_private->resourceClients objectEnumerator];
+    NSEnumerator *e = [_private->subresourceClients objectEnumerator];
     WebSubresourceClient *client;
     while ((client = [e nextObject])) {
         [[client handle] setDefersCallbacks:defers];

-- 
WebKit Debian packaging