[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 df04e848f0848ee9c82ed22d62b90db64ea17b2c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 11 09:29:28 2002 +0000

    WebKit:
    
    	Added new policy delegate callback to get the filename - this
    	won't be up to the content policy any more.
    
            * WebView.subproj/WebControllerPolicyDelegate.h:
            * WebView.subproj/WebDefaultPolicyDelegate.m:
            (-[WebDefaultPolicyDelegate saveFilenameForResponse:andRequest:]):
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:didReceiveResponse:]):
    
    WebBrowser:
    
    	Added new policy delegate callback to get the filename - this
    	won't be up to the content policy any more.
    
            * BrowserWebController.m:
            (-[BrowserWebController contentPolicyForResponse:andRequest:inFrame:withContentPolicy:]):
            (-[BrowserWebController saveFilenameForResponse:andRequest:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index eb50f00..eb2e40d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-11  Maciej Stachowiak  <mjs at apple.com>
+
+	Added new policy delegate callback to get the filename - this
+	won't be up to the content policy any more.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        (-[WebDefaultPolicyDelegate saveFilenameForResponse:andRequest:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
 2002-11-11  Darin Adler  <darin at apple.com>
 
 	- made some improvements to cursor setting for greater speed and correctness
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index eb50f00..eb2e40d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-11-11  Maciej Stachowiak  <mjs at apple.com>
+
+	Added new policy delegate callback to get the filename - this
+	won't be up to the content policy any more.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        (-[WebDefaultPolicyDelegate saveFilenameForResponse:andRequest:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
 2002-11-11  Darin Adler  <darin at apple.com>
 
 	- made some improvements to cursor setting for greater speed and correctness
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 12d9d50..0c36133 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -264,6 +264,17 @@ typedef enum {
                                        inFrame:(WebFrame *)frame
                              withContentPolicy:(WebContentPolicy *)contentPolicy;
 
+
+/*!
+    @method saveFilenameForResponse:andRequest:
+    @discussion Returns the filename to use to for a load that's being saved.
+    @param response The response for the partially loaded content.
+    @param request A WebResourceRequest for the partially loaded content.
+*/
+- (NSString *)saveFilenameForResponse:(WebResourceResponse *)response
+                           andRequest:(WebResourceRequest *)request;
+
+
 /*!
     @method unableToImplementPolicy:error:forURL:inFrame:
     @discussion Called when a WebPolicy could not be implemented. It is up to the client to display appropriate feedback.
@@ -274,3 +285,5 @@ typedef enum {
 - (void)unableToImplementPolicy:(WebPolicy *)policy error:(WebError *)error forURL:(NSURL *)URL inFrame:(WebFrame *)frame;
 
 @end
+
+
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index f332957..3398721 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -67,9 +67,10 @@
     }
 }
 
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)URL
+- (NSString *)saveFilenameForResponse:(WebResourceResponse *)response
+                           andRequest:(WebResourceRequest *)request
 {
-    NSLog (@"pluginNotFoundForMIMEType:pluginPageURL: - MIME %@, URL ", mime, URL);
+    return nil;
 }
 
 - (WebClickPolicy *)clickPolicyForAction:(NSDictionary *)actionInformation 
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 32557f0..994a3f4 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -16,6 +16,7 @@
 #import <WebKit/WebBridge.h>
 #import <WebKit/WebController.h>
 #import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebControllerPolicyDelegatePrivate.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebDocument.h>
@@ -147,6 +148,9 @@
                                                                             andRequest:[dataSource request]
                                                                                inFrame:[dataSource webFrame]
                                                                      withContentPolicy:contentPolicy];
+    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r andRequest:[dataSource request]];
+    [contentPolicy _setPath:saveFilename];
+
     [dataSource _setContentPolicy:contentPolicy];
 
     policyAction = [contentPolicy policyAction];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 32557f0..994a3f4 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -16,6 +16,7 @@
 #import <WebKit/WebBridge.h>
 #import <WebKit/WebController.h>
 #import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebControllerPolicyDelegatePrivate.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebDocument.h>
@@ -147,6 +148,9 @@
                                                                             andRequest:[dataSource request]
                                                                                inFrame:[dataSource webFrame]
                                                                      withContentPolicy:contentPolicy];
+    NSString *saveFilename = [[[dataSource controller] policyDelegate] saveFilenameForResponse:r andRequest:[dataSource request]];
+    [contentPolicy _setPath:saveFilename];
+
     [dataSource _setContentPolicy:contentPolicy];
 
     policyAction = [contentPolicy policyAction];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 12d9d50..0c36133 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -264,6 +264,17 @@ typedef enum {
                                        inFrame:(WebFrame *)frame
                              withContentPolicy:(WebContentPolicy *)contentPolicy;
 
+
+/*!
+    @method saveFilenameForResponse:andRequest:
+    @discussion Returns the filename to use to for a load that's being saved.
+    @param response The response for the partially loaded content.
+    @param request A WebResourceRequest for the partially loaded content.
+*/
+- (NSString *)saveFilenameForResponse:(WebResourceResponse *)response
+                           andRequest:(WebResourceRequest *)request;
+
+
 /*!
     @method unableToImplementPolicy:error:forURL:inFrame:
     @discussion Called when a WebPolicy could not be implemented. It is up to the client to display appropriate feedback.
@@ -274,3 +285,5 @@ typedef enum {
 - (void)unableToImplementPolicy:(WebPolicy *)policy error:(WebError *)error forURL:(NSURL *)URL inFrame:(WebFrame *)frame;
 
 @end
+
+

-- 
WebKit Debian packaging