[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 646c13b0ae2195a9461e738a11934f1b15a0b239
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 7 22:01:17 2002 +0000

            * Plugins.subproj/WebPluginDatabase.m:
            (-[WebNetscapePluginDatabase init]): Don't override document view and rep types for types that have already been registered.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f0fb3e5..126d76e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-07  Chris Blumenberg  <cblu at apple.com>
+
+`	Icing fix for: 3063517 - crash loading .png in separate window
+	
+        * Plugins.subproj/WebPluginDatabase.m:
+        (-[WebNetscapePluginDatabase init]): Don't override document view and rep types for types that have already been registered. 
+
 2002-10-07  Darin Adler  <darin at apple.com>
 
 	WebKit part of the page up/down fix.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f0fb3e5..126d76e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-07  Chris Blumenberg  <cblu at apple.com>
+
+`	Icing fix for: 3063517 - crash loading .png in separate window
+	
+        * Plugins.subproj/WebPluginDatabase.m:
+        (-[WebNetscapePluginDatabase init]): Don't override document view and rep types for types that have already been registered. 
+
 2002-10-07  Darin Adler  <darin at apple.com>
 
 	WebKit part of the page up/down fix.
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 983ca3e..0208b58 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -10,6 +10,7 @@
 #import <WebKit/WebPluginDatabase.h>
 #import <WebKit/WebPluginStream.h>
 #import <WebKit/WebView.h>
+#import <WebKit/WebViewPrivate.h>
 
 
 @implementation WebNetscapePluginDatabase
@@ -104,26 +105,22 @@ static NSArray *pluginLocations(void)
 
 - init
 {
-    NSFileManager *fileManager;
-    NSArray *pluginDirectories, *files;
-    NSString *file;
-    NSMutableArray *pluginPaths, *pluginArray;
-    NSMutableSet *filenames;
-    WebNetscapePlugin *plugin;
-    uint i, n;
-    
     self = [super init];
     if (self == nil) {
         return nil;
     }
     
-    pluginDirectories = pluginLocations();
+    NSArray *pluginDirectories = pluginLocations();
     
-    fileManager = [NSFileManager defaultManager];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
 
-    pluginPaths = [NSMutableArray arrayWithCapacity:10];
-    filenames = [NSMutableSet setWithCapacity:10];
+    NSMutableArray *pluginPaths = [NSMutableArray arrayWithCapacity:10];
+    NSMutableSet *filenames = [NSMutableSet setWithCapacity:10];
 
+    NSArray *files;
+    NSString *file;
+    uint i, n;
+    
     for (i = 0; i < [pluginDirectories count]; i++) {
         files = [fileManager directoryContentsAtPath:[pluginDirectories objectAtIndex:i]];
         for (n = 0; n < [files count]; n++) {
@@ -135,7 +132,8 @@ static NSArray *pluginLocations(void)
         }
     }
     
-    pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
+    NSMutableArray *pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
+    WebNetscapePlugin *plugin;
     
     for (i = 0; i < [pluginPaths count]; i++) {
         plugin = [[WebNetscapePlugin alloc] initWithPath:[pluginPaths objectAtIndex:i]];
@@ -149,11 +147,21 @@ static NSArray *pluginLocations(void)
 
     plugins = [pluginArray copy];
 
-    // register plug-in WebDocumentViews and WebDocumentRepresentations
+    // Register plug-in WebDocumentViews and WebDocumentRepresentations
+    
+    
+    NSArray *viewTypes = [[WebView _viewTypes] allKeys];
     NSArray *mimes = [self MIMETypes];
+    NSString *mime;
+    
     for (i = 0; i < [mimes count]; i++) {
-        [WebView registerViewClass:[WebNetscapePluginDocumentView class] forMIMEType:[mimes objectAtIndex:i]];
-        [WebDataSource registerRepresentationClass:[WebNetscapePluginStream class] forMIMEType:[mimes objectAtIndex:i]];
+        mime = [mimes objectAtIndex:i];
+        
+        // Don't override previously registered types.
+        if(![viewTypes containsObject:mime]){
+            [WebView registerViewClass:[WebNetscapePluginDocumentView class] forMIMEType:mime];
+            [WebDataSource registerRepresentationClass:[WebNetscapePluginStream class] forMIMEType:mime];
+        }
     }
 
     return self;

-- 
WebKit Debian packaging