[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 065a97f91e4140a42dce245f6cec1b5c0ceadc32
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 14 03:20:04 2002 +0000

    WebKit:
    
    	Pass mime type instead of full response to content policy delegate
    	method, in preparation for merging it with the file URL policy.
    
            * WebView.subproj/WebControllerPolicyDelegate.h:
            * WebView.subproj/WebDefaultPolicyDelegate.m:
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:didReceiveResponse:]):
    
    WebBrowser:
    
    	Pass mime type instead of full response to content policy delegate
    	method, in preparation for merging it with the file URL policy.
    
            * BrowserWebController.m:
            (-[BrowserWebController contentPolicyForMIMEType:andRequest:inFrame:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4854ef4..013f1ba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-13  Maciej Stachowiak  <mjs at apple.com>
+
+	Pass mime type instead of full response to content policy delegate
+	method, in preparation for merging it with the file URL policy.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
 2002-11-13  Darin Adler  <darin at apple.com>
 
 	- fixed 3083982 -- Logging into AOL gives null view
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4854ef4..013f1ba 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-11-13  Maciej Stachowiak  <mjs at apple.com>
+
+	Pass mime type instead of full response to content policy delegate
+	method, in preparation for merging it with the file URL policy.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
 2002-11-13  Darin Adler  <darin at apple.com>
 
 	- fixed 3083982 -- Logging into AOL gives null view
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 4f38deb..4a7cab5 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -93,8 +93,7 @@ typedef enum {
     policies that determine the action of what to do with the URL or the data that
     the URL represents. Typically, the policy handler methods are called in this order:
 
-    clickPolicyForElement:button:modifierFlags:<BR>
-    URLPolicyForRequest:inFrame:<BR>
+    navigationPolicyForAction:andRequest:inFrame:<BR>
     fileURLPolicyForMIMEType:andRequest:inFrame:<BR>
     contentPolicyForMIMEType:andRequest:inFrame:<BR>
 */
@@ -127,11 +126,11 @@ typedef enum {
 /*!
     @method contentPolicyForResponse:andRequest:inFrame:withContentPolicy:
     @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted. 
-    @param response The response for the partially loaded content.
+    @param type MIME type for the file.
     @param request A WebResourceRequest for the partially loaded content.
     @param frame The frame which is loading the URL.
 */
-- (WebContentAction)contentPolicyForResponse:(WebResourceResponse *)response
+- (WebContentAction)contentPolicyForMIMEType:(NSString *)type
                                     andRequest:(WebResourceRequest *)request
                                        inFrame:(WebFrame *)frame;
 
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 70c7c19..42c779e 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -39,11 +39,11 @@
 }
 
 
-- (WebPolicyAction)contentPolicyForResponse:(WebResourceResponse *)response
-				    andRequest:(WebResourceRequest *)request
-                                       inFrame:(WebFrame *)frame;
+- (WebPolicyAction)contentPolicyForMIMEType:(NSString *)type
+				 andRequest:(WebResourceRequest *)request
+				    inFrame:(WebFrame *)frame;
 {
-    if ([WebController canShowMIMEType:[response contentType]]) {
+    if ([WebController canShowMIMEType:type]) {
         return WebContentPolicyShow;
     } else {
         return WebContentPolicyIgnore;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index a056d85..1bc4aa5 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -143,7 +143,7 @@
 
     // Figure out the content policy.
     if (![dataSource isDownloading]) {
-	contentPolicy = [[[dataSource controller] policyDelegate] contentPolicyForResponse:r
+	contentPolicy = [[[dataSource controller] policyDelegate] contentPolicyForMIMEType:[r contentType]
 								  andRequest:[dataSource request]
 								  inFrame:[dataSource webFrame]];
     } else {
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index a056d85..1bc4aa5 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -143,7 +143,7 @@
 
     // Figure out the content policy.
     if (![dataSource isDownloading]) {
-	contentPolicy = [[[dataSource controller] policyDelegate] contentPolicyForResponse:r
+	contentPolicy = [[[dataSource controller] policyDelegate] contentPolicyForMIMEType:[r contentType]
 								  andRequest:[dataSource request]
 								  inFrame:[dataSource webFrame]];
     } else {
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 4f38deb..4a7cab5 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -93,8 +93,7 @@ typedef enum {
     policies that determine the action of what to do with the URL or the data that
     the URL represents. Typically, the policy handler methods are called in this order:
 
-    clickPolicyForElement:button:modifierFlags:<BR>
-    URLPolicyForRequest:inFrame:<BR>
+    navigationPolicyForAction:andRequest:inFrame:<BR>
     fileURLPolicyForMIMEType:andRequest:inFrame:<BR>
     contentPolicyForMIMEType:andRequest:inFrame:<BR>
 */
@@ -127,11 +126,11 @@ typedef enum {
 /*!
     @method contentPolicyForResponse:andRequest:inFrame:withContentPolicy:
     @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted. 
-    @param response The response for the partially loaded content.
+    @param type MIME type for the file.
     @param request A WebResourceRequest for the partially loaded content.
     @param frame The frame which is loading the URL.
 */
-- (WebContentAction)contentPolicyForResponse:(WebResourceResponse *)response
+- (WebContentAction)contentPolicyForMIMEType:(NSString *)type
                                     andRequest:(WebResourceRequest *)request
                                        inFrame:(WebFrame *)frame;
 

-- 
WebKit Debian packaging