[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 9a2105fbcbc68dc6af98385e8428b58432d0b9b8
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 4 02:35:53 2002 +0000

            Create the activity entry in resourceRequest:didReceiveResponse:fromDataSource:
            rather than resourceRequest:willSendRequest:fromDataSource:.
    
            * BrowserWebController.m:
            (-[BrowserWebController resourceRequest:willSendRequest:fromDataSource:]):
            (-[BrowserWebController resourceRequest:didReceiveResponse:fromDataSource:]):
    
            Always call resourceRequest:willSendRequest: on resourceProgressDelegate.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:willSendRequest:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d181b4d..0c06d37 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-10-03  Richard Williamson   <rjw at apple.com>
 
+        Always call resourceRequest:willSendRequest: on resourceProgressDelegate.
+         
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+
+2002-10-03  Richard Williamson   <rjw at apple.com>
+
         Add calls to downloadProgressDelegate.
         
         * WebView.subproj/WebMainResourceClient.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d181b4d..0c06d37 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-10-03  Richard Williamson   <rjw at apple.com>
 
+        Always call resourceRequest:willSendRequest: on resourceProgressDelegate.
+         
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+
+2002-10-03  Richard Williamson   <rjw at apple.com>
+
         Add calls to downloadProgressDelegate.
         
         * WebView.subproj/WebMainResourceClient.m:
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 87c5c50..fec5e12 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -197,7 +197,6 @@
 -(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)newRequest
 {
     WebController *controller = [dataSource controller];
-    WebContentPolicy *contentPolicy = [dataSource contentPolicy];
     NSURL *URL = [newRequest URL];
 
     LOG(Redirect, "URL = %@", URL);
@@ -218,9 +217,8 @@
         [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];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 87c5c50..fec5e12 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -197,7 +197,6 @@
 -(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)newRequest
 {
     WebController *controller = [dataSource controller];
-    WebContentPolicy *contentPolicy = [dataSource contentPolicy];
     NSURL *URL = [newRequest URL];
 
     LOG(Redirect, "URL = %@", URL);
@@ -218,9 +217,8 @@
         [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];

-- 
WebKit Debian packaging