[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 f5e58ed923f081dd2b5ca95aacafc2c4936d2646
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 2 17:39:40 2002 +0000

    	Cut down on unnecessary use of WebFoundation private stuff.
    
            * Plugins.subproj/WebPluginStream.m:
            (-[WebNetscapePluginStream startLoad]): Remove unnecessary use of
    	[WebResourceHandle _request].
            * WebCoreSupport.subproj/WebSubresourceClient.m:
            (-[WebSubresourceClient handleDidFinishLoading:]): Remove assert about
    	status code, since status codes are going away.
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient didCancelWithHandle:]): Use currentURL for logging.
            (-[WebMainResourceClient handleDidFinishLoading:]): Ditto.
            (-[WebMainResourceClient handle:didReceiveData:]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5aa23fd..7ba32d6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,20 @@
 2002-10-02  Darin Adler  <darin at apple.com>
 
+	Cut down on unnecessary use of WebFoundation private stuff.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream startLoad]): Remove unnecessary use of
+	[WebResourceHandle _request].
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handleDidFinishLoading:]): Remove assert about
+	status code, since status codes are going away.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient didCancelWithHandle:]): Use currentURL for logging.
+        (-[WebMainResourceClient handleDidFinishLoading:]): Ditto.
+        (-[WebMainResourceClient handle:didReceiveData:]): Ditto.
+
+2002-10-02  Darin Adler  <darin at apple.com>
+
         * WebView.subproj/WebControllerPolicyDelegate.h: Change modifierMask to
 	modifierFlags to match NSEvent.
         * WebView.subproj/WebDefaultPolicyDelegate.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5aa23fd..7ba32d6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,20 @@
 2002-10-02  Darin Adler  <darin at apple.com>
 
+	Cut down on unnecessary use of WebFoundation private stuff.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream startLoad]): Remove unnecessary use of
+	[WebResourceHandle _request].
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handleDidFinishLoading:]): Remove assert about
+	status code, since status codes are going away.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient didCancelWithHandle:]): Use currentURL for logging.
+        (-[WebMainResourceClient handleDidFinishLoading:]): Ditto.
+        (-[WebMainResourceClient handle:didReceiveData:]): Ditto.
+
+2002-10-02  Darin Adler  <darin at apple.com>
+
         * WebView.subproj/WebControllerPolicyDelegate.h: Change modifierMask to
 	modifierFlags to match NSEvent.
         * WebView.subproj/WebDefaultPolicyDelegate.m:
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 2f6eb53..cd36d06 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -17,7 +17,6 @@
 #import <WebFoundation/WebError.h>
 #import <WebFoundation/WebNSFileManagerExtras.h>
 #import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
 #import <WebFoundation/WebResourceRequest.h>
 #import <WebFoundation/WebResourceResponse.h>
 
@@ -103,7 +102,7 @@
 {
     resource = [[WebResourceHandle alloc] initWithRequest:request];
     [resource loadWithDelegate:self];
-    [[view controller] _didStartLoading:[[resource _request] URL]];
+    [[view controller] _didStartLoading:[request URL]];
 }
 
 - (void)stop
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 02569ed..04d9df9 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -10,7 +10,6 @@
 
 #import <WebFoundation/WebError.h>
 #import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
 #import <WebFoundation/WebResourceRequest.h>
 #import <WebFoundation/WebHTTPResourceRequest.h>
 #import <WebFoundation/WebResourceResponse.h>
@@ -152,7 +151,6 @@
 - (void)handleDidFinishLoading:(WebResourceHandle *)h
 {
     ASSERT(handle == h);
-    ASSERT([h _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
     [self retain];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 02569ed..04d9df9 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -10,7 +10,6 @@
 
 #import <WebFoundation/WebError.h>
 #import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
 #import <WebFoundation/WebResourceRequest.h>
 #import <WebFoundation/WebHTTPResourceRequest.h>
 #import <WebFoundation/WebResourceResponse.h>
@@ -152,7 +151,6 @@
 - (void)handleDidFinishLoading:(WebResourceHandle *)h
 {
     ASSERT(handle == h);
-    ASSERT([h _statusCode] == WebResourceHandleStatusLoadComplete);
 
     // Calling _removeSubresourceClient will likely result in a call to release, so we must retain.
     [self retain];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index eafd6ae..29504ee 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -22,7 +22,6 @@
 #import <WebFoundation/WebError.h>
 #import <WebFoundation/WebFileTypeMappings.h>
 #import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
 #import <WebFoundation/WebResourceRequest.h>
 #import <WebFoundation/WebHTTPResourceRequest.h>
 #import <WebFoundation/WebResourceResponse.h>
@@ -130,7 +129,7 @@
         return;
     }
     
-    LOG(Loading, "URL = %@", [[handle _request] URL]);
+    LOG(Loading, "URL = %@", currentURL);
     
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];
@@ -158,11 +157,8 @@
 
 - (void)handleDidFinishLoading:(WebResourceHandle *)handle
 {
-    LOG(Loading, "URL = %@", [[handle _request] URL]);
+    LOG(Loading, "URL = %@", currentURL);
     
-    ASSERT([currentURL isEqual:[[handle _request] URL]]);
-    ASSERT([handle _statusCode] == WebResourceHandleStatusLoadComplete);
-
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];
 
@@ -230,9 +226,7 @@
     WebFrame *frame = [dataSource webFrame];
     WebError *downloadError = nil;
     
-    LOG(Loading, "URL = %@, data = %p, length %d", [[handle _request] URL], data, [data length]);
-    
-    ASSERT([currentURL isEqual:[[handle _request] URL]]);
+    LOG(Loading, "URL = %@, data = %p, length %d", currentURL, data, [data length]);
     
     // Check the mime type and ask the client for the content policy.
     if(isFirstChunk){
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index eafd6ae..29504ee 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -22,7 +22,6 @@
 #import <WebFoundation/WebError.h>
 #import <WebFoundation/WebFileTypeMappings.h>
 #import <WebFoundation/WebResourceHandle.h>
-#import <WebFoundation/WebResourceHandlePrivate.h>
 #import <WebFoundation/WebResourceRequest.h>
 #import <WebFoundation/WebHTTPResourceRequest.h>
 #import <WebFoundation/WebResourceResponse.h>
@@ -130,7 +129,7 @@
         return;
     }
     
-    LOG(Loading, "URL = %@", [[handle _request] URL]);
+    LOG(Loading, "URL = %@", currentURL);
     
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];
@@ -158,11 +157,8 @@
 
 - (void)handleDidFinishLoading:(WebResourceHandle *)handle
 {
-    LOG(Loading, "URL = %@", [[handle _request] URL]);
+    LOG(Loading, "URL = %@", currentURL);
     
-    ASSERT([currentURL isEqual:[[handle _request] URL]]);
-    ASSERT([handle _statusCode] == WebResourceHandleStatusLoadComplete);
-
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];
 
@@ -230,9 +226,7 @@
     WebFrame *frame = [dataSource webFrame];
     WebError *downloadError = nil;
     
-    LOG(Loading, "URL = %@, data = %p, length %d", [[handle _request] URL], data, [data length]);
-    
-    ASSERT([currentURL isEqual:[[handle _request] URL]]);
+    LOG(Loading, "URL = %@, data = %p, length %d", currentURL, data, [data length]);
     
     // Check the mime type and ask the client for the content policy.
     if(isFirstChunk){

-- 
WebKit Debian packaging