[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 07a2bd186575f1e5e335921f872ea026d787e376
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 4 02:11:55 2002 +0000

            Add calls to downloadProgressDelegate.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:willSendRequest:]):
            (-[WebMainResourceClient handle:didReceiveResponse:]):
            (-[WebMainResourceClient handle:didReceiveData:]):
            (-[WebMainResourceClient handle:didFailLoadingWithError:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d8e4335..d181b4d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2002-10-03  Richard Williamson   <rjw at apple.com>
 
+        Add calls to downloadProgressDelegate.
+        
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+        (-[WebMainResourceClient handle:didReceiveData:]):
+        (-[WebMainResourceClient handle:didFailLoadingWithError:]):
+
+2002-10-03  Richard Williamson   <rjw at apple.com>
+
         
         * WebCoreSupport.subproj/WebBridge.m:
         (-[WebBridge objectLoadedFromCache:size:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d8e4335..d181b4d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-10-03  Richard Williamson   <rjw at apple.com>
 
+        Add calls to downloadProgressDelegate.
+        
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+        (-[WebMainResourceClient handle:didReceiveData:]):
+        (-[WebMainResourceClient handle:didFailLoadingWithError:]):
+
+2002-10-03  Richard Williamson   <rjw at apple.com>
+
         
         * WebCoreSupport.subproj/WebBridge.m:
         (-[WebBridge objectLoadedFromCache:size:]):
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index e14383c..87c5c50 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -197,6 +197,7 @@
 -(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)newRequest
 {
     WebController *controller = [dataSource controller];
+    WebContentPolicy *contentPolicy = [dataSource contentPolicy];
     NSURL *URL = [newRequest URL];
 
     LOG(Redirect, "URL = %@", URL);
@@ -217,8 +218,9 @@
         [self didStartLoadingWithURL:URL];
     }
 
+    if ([contentPolicy policyAction] == WebContentPolicyShow)
     // Let the resourceProgressDelegate get a crack at modifying the request.
-    newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
 
     WebResourceRequest *oldRequest = request;
     request = [newRequest copy];
@@ -266,6 +268,7 @@
         [[dataSource webFrame] _setProvisionalDataSource:nil];
         [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
         downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
+        [downloadProgressDelegate resourceRequest: request didReceiveResponse: response fromDataSource: dataSource];
         break;
     case WebContentPolicyIgnore:
         [handle cancel];
@@ -287,6 +290,7 @@
 
     if (downloadHandler) {
         downloadError = [downloadHandler receivedData:data];
+        [downloadProgressDelegate resourceRequest: request didReceiveContentLength: [data length] fromDataSource:dataSource];
     } else {
         [resourceData appendData:data];
         [dataSource _receivedData:data];
@@ -311,7 +315,8 @@
 {
     LOG(Loading, "URL = %@, result = %@", [result failingURL], [result errorDescription]);
 
-    [resourceProgressDelegate resourceRequest: request didFailLoadingWithError: result fromDataSource: dataSource];
+    if (!downloadHandler)
+        [resourceProgressDelegate resourceRequest: request didFailLoadingWithError: result fromDataSource: dataSource];
 
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index e14383c..87c5c50 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -197,6 +197,7 @@
 -(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)newRequest
 {
     WebController *controller = [dataSource controller];
+    WebContentPolicy *contentPolicy = [dataSource contentPolicy];
     NSURL *URL = [newRequest URL];
 
     LOG(Redirect, "URL = %@", URL);
@@ -217,8 +218,9 @@
         [self didStartLoadingWithURL:URL];
     }
 
+    if ([contentPolicy policyAction] == WebContentPolicyShow)
     // Let the resourceProgressDelegate get a crack at modifying the request.
-    newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
 
     WebResourceRequest *oldRequest = request;
     request = [newRequest copy];
@@ -266,6 +268,7 @@
         [[dataSource webFrame] _setProvisionalDataSource:nil];
         [[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
         downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
+        [downloadProgressDelegate resourceRequest: request didReceiveResponse: response fromDataSource: dataSource];
         break;
     case WebContentPolicyIgnore:
         [handle cancel];
@@ -287,6 +290,7 @@
 
     if (downloadHandler) {
         downloadError = [downloadHandler receivedData:data];
+        [downloadProgressDelegate resourceRequest: request didReceiveContentLength: [data length] fromDataSource:dataSource];
     } else {
         [resourceData appendData:data];
         [dataSource _receivedData:data];
@@ -311,7 +315,8 @@
 {
     LOG(Loading, "URL = %@, result = %@", [result failingURL], [result errorDescription]);
 
-    [resourceProgressDelegate resourceRequest: request didFailLoadingWithError: result fromDataSource: dataSource];
+    if (!downloadHandler)
+        [resourceProgressDelegate resourceRequest: request didFailLoadingWithError: result fromDataSource: dataSource];
 
     // Calling receivedError will likely result in a call to release, so we must retain.
     [self retain];

-- 
WebKit Debian packaging