[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit c6c941a28e7d83562b1a1f345c3f5ec111b1e1f4
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 30 07:58:50 2002 +0000

    WebKit:
    
    	First step towards policy API change. Pass request instead of URL
    	to content policy delegate method.
    
            * WebView.subproj/WebControllerPolicyDelegate.h:
            * WebView.subproj/WebDefaultPolicyDelegate.m:
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:didReceiveResponse:]):
    
    WebBrowser:
    
    	First step towards policy API change. Pass request instead of URL
    	to content policy delegate method.
    
            * BrowserWebController.m:
            (-[BrowserWebController contentPolicyForResponse:andRequest:inFrame:withContentPolicy:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2505 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6bfba74..49b0a92 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2002-10-29  Maciej Stachowiak  <mjs at apple.com>
 
+	First step towards policy API change. Pass request instead of URL
+	to content policy delegate method.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
+2002-10-29  Maciej Stachowiak  <mjs at apple.com>
+
 	- fixed 3087548 - REGRESSION: two windows open for netflix confirmation
 	
         * WebView.subproj/WebControllerPrivate.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 6bfba74..49b0a92 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-10-29  Maciej Stachowiak  <mjs at apple.com>
 
+	First step towards policy API change. Pass request instead of URL
+	to content policy delegate method.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
+2002-10-29  Maciej Stachowiak  <mjs at apple.com>
+
 	- fixed 3087548 - REGRESSION: two windows open for netflix confirmation
 	
         * WebView.subproj/WebControllerPrivate.h:
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index c8b80c4..3bcafc2 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -11,6 +11,7 @@
 @class WebFrame;
 @class WebPolicyPrivate;
 @class WebResourceResponse;
+ at class WebResourceRequest;
 
 /*!
     @enum WebPolicyAction
@@ -234,17 +235,15 @@ typedef enum {
 - (WebFileURLPolicy *)fileURLPolicyForMIMEType: (NSString *)type inFrame:(WebFrame *)frame isDirectory: (BOOL)isDirectory;
 
 /*!
-    @method contentPolicyForResponse:andURL:inFrame:withContentPolicy:
+    @method contentPolicyForResponse:andRequest:inFrame:withContentPolicy:
     @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted. 
-    Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
-    after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-    @param response of the partially loaded content.
-    @param URL URL of the partially loaded content.
+    @param response The response for the partially loaded content.
+    @param request A WebResourceRequest for the partially loaded content.
     @param frame The frame which is loading the URL.
     @param content policy if one was determined before the load started. nil if none was predetermined.
 */
 - (WebContentPolicy *)contentPolicyForResponse:(WebResourceResponse *)response
-                                        andURL:(NSURL *)URL
+                                    andRequest:(WebResourceRequest *)request
                                        inFrame:(WebFrame *)frame
                              withContentPolicy:(WebContentPolicy *)contentPolicy;
 
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 9a9deca..386c76a 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -52,7 +52,7 @@
 
 
 - (WebContentPolicy *)contentPolicyForResponse:(WebResourceResponse *)response
-                                        andURL:(NSURL *)URL
+				    andRequest:(WebResourceRequest *)request
                                        inFrame:(WebFrame *)frame
                              withContentPolicy:(WebContentPolicy *)contentPolicy;
 {
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 2753812..7ece672 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -164,7 +164,7 @@
     // Figure out the content policy.
     WebContentPolicy *contentPolicy = [dataSource contentPolicy];
     contentPolicy = [[[dataSource controller] policyDelegate] contentPolicyForResponse:r
-                                                                                andURL:currentURL
+                                                                            andRequest:[dataSource request]
                                                                                inFrame:[dataSource webFrame]
                                                                      withContentPolicy:contentPolicy];
     [dataSource _setContentPolicy:contentPolicy];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 2753812..7ece672 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -164,7 +164,7 @@
     // Figure out the content policy.
     WebContentPolicy *contentPolicy = [dataSource contentPolicy];
     contentPolicy = [[[dataSource controller] policyDelegate] contentPolicyForResponse:r
-                                                                                andURL:currentURL
+                                                                            andRequest:[dataSource request]
                                                                                inFrame:[dataSource webFrame]
                                                                      withContentPolicy:contentPolicy];
     [dataSource _setContentPolicy:contentPolicy];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index c8b80c4..3bcafc2 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -11,6 +11,7 @@
 @class WebFrame;
 @class WebPolicyPrivate;
 @class WebResourceResponse;
+ at class WebResourceRequest;
 
 /*!
     @enum WebPolicyAction
@@ -234,17 +235,15 @@ typedef enum {
 - (WebFileURLPolicy *)fileURLPolicyForMIMEType: (NSString *)type inFrame:(WebFrame *)frame isDirectory: (BOOL)isDirectory;
 
 /*!
-    @method contentPolicyForResponse:andURL:inFrame:withContentPolicy:
+    @method contentPolicyForResponse:andRequest:inFrame:withContentPolicy:
     @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted. 
-    Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
-    after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-    @param response of the partially loaded content.
-    @param URL URL of the partially loaded content.
+    @param response The response for the partially loaded content.
+    @param request A WebResourceRequest for the partially loaded content.
     @param frame The frame which is loading the URL.
     @param content policy if one was determined before the load started. nil if none was predetermined.
 */
 - (WebContentPolicy *)contentPolicyForResponse:(WebResourceResponse *)response
-                                        andURL:(NSURL *)URL
+                                    andRequest:(WebResourceRequest *)request
                                        inFrame:(WebFrame *)frame
                              withContentPolicy:(WebContentPolicy *)contentPolicy;
 

-- 
WebKit Debian packaging