[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 a58cde9f2c0ad14f75e61b4ca4d7590be33a87b0
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 30 01:30:19 2003 +0000

    WebKit:
    
    	WebKit part of fix for:
    	<rdar://problem/3467744>: Photoshop files (.psd) don't show up in Open dialog in Safari, but can be viewed
    	<rdar://problem/3109132>: Can't open movie file via open panel even though it can be dropped in browser window
    
            Reviewed by john.
    
            * WebView.subproj/WebView.m:
            (+[WebView _supportedMIMETypes]): new
            (+[WebView _supportedFileExtensions]): new
            * WebView.subproj/WebViewPrivate.h:
    
    WebBrowser:
    
    	Fixed:
    	<rdar://problem/3467744>: Photoshop files (.psd) don't show up in Open dialog in Safari, but can be viewed
    	<rdar://problem/3109132>: Can't open movie file via open panel even though it can be dropped in browser window
    
            Reviewed by john.
    
            * BrowserDocumentController.m:
            (-[BrowserDocumentController _openableFileExtensions]): override, returns list of types that Safari and WebKit can handle so the NSOpenPanel properly enables files
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d1d3323..4de15aa 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2003-10-29  Chris Blumenberg  <cblu at apple.com>
 
+	WebKit part of fix for:
+	<rdar://problem/3467744>: Photoshop files (.psd) don't show up in Open dialog in Safari, but can be viewed
+	<rdar://problem/3109132>: Can't open movie file via open panel even though it can be dropped in browser window
+
+        Reviewed by john.
+
+        * WebView.subproj/WebView.m:
+        (+[WebView _supportedMIMETypes]): new
+        (+[WebView _supportedFileExtensions]): new
+        * WebView.subproj/WebViewPrivate.h:
+
+2003-10-29  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3438716>: jpg and gif images copied from Safari and placed in mail are sent as tiff
 
         Reviewed by john.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 70c6e75..af40071 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -142,6 +142,30 @@ NSString *_WebMainFrameURLKey =         @"mainFrameURL";
 
 @implementation WebView (WebPrivate)
 
++ (NSArray *)_supportedMIMETypes
+{
+    // Load the plug-in DB allowing plug-ins to install types.
+    [WebPluginDatabase installedPlugins];
+    return [[WebFrameView _viewTypesAllowImageTypeOmission:NO] allKeys];
+}
+
++ (NSArray *)_supportedFileExtensions
+{
+    NSMutableSet *extensions = [[NSMutableSet alloc] init];
+    NSArray *MIMETypes = [self _supportedMIMETypes];
+    NSEnumerator *enumerator = [MIMETypes objectEnumerator];
+    NSString *MIMEType;
+    while ((MIMEType = [enumerator nextObject]) != nil) {
+        NSString *extension = [self suggestedFileExtensionForMIMEType:MIMEType];
+        if (extension) {
+            [extensions addObject:extension];
+        }
+    }
+    NSArray *uniqueExtensions = [extensions allObjects];
+    [extensions release];
+    return uniqueExtensions;
+}
+
 + (BOOL)_viewClass:(Class *)vClass andRepresentationClass:(Class *)rClass forMIMEType:(NSString *)MIMEType;
 {
     MIMEType = [MIMEType lowercaseString];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 3a19bd6..abe31cb 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -107,6 +107,8 @@ extern NSString *_WebMainFrameURLKey;
 
 + (BOOL)_viewClass:(Class *)vClass andRepresentationClass:(Class *)rClass forMIMEType:(NSString *)MIMEType;
 
++ (NSArray *)_supportedFileExtensions;
+
 /*!
     @method canShowFile:
     @abstract Checks if the WebKit can show the content of the file at the specified path.

-- 
WebKit Debian packaging