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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit f88d4880afe8f0cf3c17c7594fb59c9978934fd3
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 3 04:43:28 2002 +0000

    WebKit:
    
    	Added IFFileURLPolicyReveal. This makes things a little clearer for the client.
    
            * WebView.subproj/IFWebControllerPolicyHandler.h:
            * WebView.subproj/IFWebFramePrivate.mm:
            (-[IFWebFrame _shouldShowDataSource:]): support for IFFileURLPolicyReveal.
    
    WebBrowser:
    
    	Added IFFileURLPolicyReveal. This makes things a little clearer for the client.
    
            * WebController.m:
            (-[BrowserWebController unableToImplementURLPolicyForURL:error:]): removed old comments
            (-[BrowserWebController fileURLPolicyForMIMEType:dataSource:isDirectory:]): use
    	IFFileURLPolicyReveal for files we don't open and IFFileURLPolicyOpenExternally for directories
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 911acf5..549f8e1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-02  Chris Blumenberg  <cblu at apple.com>
+
+	Added IFFileURLPolicyReveal. This makes things a little clearer for the client.
+
+        * WebView.subproj/IFWebControllerPolicyHandler.h:
+        * WebView.subproj/IFWebFramePrivate.mm:
+        (-[IFWebFrame _shouldShowDataSource:]): support for IFFileURLPolicyReveal.
+
 2002-07-02  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 911acf5..549f8e1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-07-02  Chris Blumenberg  <cblu at apple.com>
+
+	Added IFFileURLPolicyReveal. This makes things a little clearer for the client.
+
+        * WebView.subproj/IFWebControllerPolicyHandler.h:
+        * WebView.subproj/IFWebFramePrivate.mm:
+        (-[IFWebFrame _shouldShowDataSource:]): support for IFFileURLPolicyReveal.
+
 2002-07-02  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/IFImageRenderer.m:
diff --git a/WebKit/WebView.subproj/IFWebControllerPolicyHandler.h b/WebKit/WebView.subproj/IFWebControllerPolicyHandler.h
index 8d99688..6cb393e 100644
--- a/WebKit/WebView.subproj/IFWebControllerPolicyHandler.h
+++ b/WebKit/WebView.subproj/IFWebControllerPolicyHandler.h
@@ -22,6 +22,7 @@ typedef enum {
 typedef enum {
     IFFileURLPolicyUseContentPolicy,
     IFFileURLPolicyOpenExternally,
+    IFFileURLPolicyReveal,
     IFFileURLPolicyIgnore
 } IFFileURLPolicy;
 
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 6298906..a4b0839 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -532,21 +532,19 @@ static const char * const stateNames[6] = {
                     return YES;
                 }
             }else if(fileURLPolicy == IFFileURLPolicyOpenExternally){
-                if(isDirectory){
-                    if(![workspace selectFile:path inFileViewerRootedAtPath:@""]){
+                if(![workspace openFile:path]){
+                    error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForFile 
+                                inDomain:IFErrorCodeDomainWebKit failingURL: url];
+                    [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
+                }
+                return NO;
+            }else if(fileURLPolicy == IFFileURLPolicyReveal){
+                if(![workspace selectFile:path inFileViewerRootedAtPath:@""]){
                         error = [[IFError alloc] initWithErrorCode:IFErrorCodeFinderCouldntOpenDirectory 
                                     inDomain:IFErrorCodeDomainWebKit failingURL: url];
                         [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
                     }
-                    return NO;
-                }else{
-                    if(![workspace openFile:path]){
-                        error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForFile 
-                                    inDomain:IFErrorCodeDomainWebKit failingURL: url];
-                        [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
-                    }
-                    return NO;
-                }
+                return NO;
             }else{
                 [NSException raise:NSInvalidArgumentException format:
                     @"fileURLPolicyForMIMEType:dataSource:isDirectory: returned an invalid IFFileURLPolicy"];
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 8d99688..6cb393e 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -22,6 +22,7 @@ typedef enum {
 typedef enum {
     IFFileURLPolicyUseContentPolicy,
     IFFileURLPolicyOpenExternally,
+    IFFileURLPolicyReveal,
     IFFileURLPolicyIgnore
 } IFFileURLPolicy;
 
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandler.h b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
index 8d99688..6cb393e 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyHandler.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
@@ -22,6 +22,7 @@ typedef enum {
 typedef enum {
     IFFileURLPolicyUseContentPolicy,
     IFFileURLPolicyOpenExternally,
+    IFFileURLPolicyReveal,
     IFFileURLPolicyIgnore
 } IFFileURLPolicy;
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 6298906..a4b0839 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -532,21 +532,19 @@ static const char * const stateNames[6] = {
                     return YES;
                 }
             }else if(fileURLPolicy == IFFileURLPolicyOpenExternally){
-                if(isDirectory){
-                    if(![workspace selectFile:path inFileViewerRootedAtPath:@""]){
+                if(![workspace openFile:path]){
+                    error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForFile 
+                                inDomain:IFErrorCodeDomainWebKit failingURL: url];
+                    [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
+                }
+                return NO;
+            }else if(fileURLPolicy == IFFileURLPolicyReveal){
+                if(![workspace selectFile:path inFileViewerRootedAtPath:@""]){
                         error = [[IFError alloc] initWithErrorCode:IFErrorCodeFinderCouldntOpenDirectory 
                                     inDomain:IFErrorCodeDomainWebKit failingURL: url];
                         [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
                     }
-                    return NO;
-                }else{
-                    if(![workspace openFile:path]){
-                        error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForFile 
-                                    inDomain:IFErrorCodeDomainWebKit failingURL: url];
-                        [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
-                    }
-                    return NO;
-                }
+                return NO;
             }else{
                 [NSException raise:NSInvalidArgumentException format:
                     @"fileURLPolicyForMIMEType:dataSource:isDirectory: returned an invalid IFFileURLPolicy"];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 8d99688..6cb393e 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -22,6 +22,7 @@ typedef enum {
 typedef enum {
     IFFileURLPolicyUseContentPolicy,
     IFFileURLPolicyOpenExternally,
+    IFFileURLPolicyReveal,
     IFFileURLPolicyIgnore
 } IFFileURLPolicy;
 

-- 
WebKit Debian packaging