Changeset 61523 in webkit

Timestamp:

Jun 20, 2010 7:34:54 PM (14 years ago)

Author:

andersca@apple.com

Message:

2010-06-20 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

Get rid of the extensionToMIME mapping in WebBasePluginPackage
​https://bugs.webkit.org/show_bug.cgi?id=40897

Instead of using the extensionToMIME mutable dictionary, use the MIME types vector.
While this makes lookup of MIME types based on extensions linear instead of constant,
the number of extensions per plug-in is too small for it to matter.

• Plugins/WebBasePluginPackage.h:
• Plugins/WebBasePluginPackage.mm: (-[WebBasePluginPackage initWithPath:]): (-[WebBasePluginPackage dealloc]): (-[WebBasePluginPackage supportsExtension:]): (-[WebBasePluginPackage MIMETypeForExtension:]): (-[WebBasePluginPackage setMIMEToExtensionsDictionary:]):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebBasePluginPackage.h (modified) (3 diffs)
• Plugins/WebBasePluginPackage.mm (modified) (5 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-06-20  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Get rid of the extensionToMIME mapping in WebBasePluginPackage
+        https://bugs.webkit.org/show_bug.cgi?id=40897
+
+        Instead of using the extensionToMIME mutable dictionary, use the MIME types vector.
+        While this makes lookup of MIME types based on extensions linear instead of constant,
+        the number of extensions per plug-in is too small for it to matter.
+
+        * Plugins/WebBasePluginPackage.h:
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage initWithPath:]):
+        (-[WebBasePluginPackage dealloc]):
+        (-[WebBasePluginPackage supportsExtension:]):
+        (-[WebBasePluginPackage MIMETypeForExtension:]):
+        (-[WebBasePluginPackage setMIMEToExtensionsDictionary:]):
+
 2010-06-20  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/mac/Plugins/WebBasePluginPackage.h

@@ -67 +67 @@
     NSDictionary *MIMEToDescription;
     NSDictionary *MIMEToExtensions;
-    NSMutableDictionary *extensionToMIME;
     
     BP_CreatePluginMIMETypesPreferencesFuncPtr BP_CreatePluginMIMETypesPreferences;
@@ -89 +88 @@
 - (WebCore::String)bundleIdentifier;
 
-- (BOOL)supportsExtension:(NSString *)extension;
+- (BOOL)supportsExtension:(const WebCore::String&)extension;
 - (BOOL)supportsMIMEType:(NSString *)MIMEType;
 
@@ -95 +94 @@
 
 - (NSString *)descriptionForMIMEType:(NSString *)MIMEType;
-- (NSString *)MIMETypeForExtension:(NSString *)extension;
+- (NSString *)MIMETypeForExtension:(const WebCore::String&)extension;
 - (NSArray *)extensionsForMIMEType:(NSString *)MIMEType;
 

trunk/WebKit/mac/Plugins/WebBasePluginPackage.mm

@@ -134 +134 @@
     }
 #endif
-    extensionToMIME = [[NSMutableDictionary alloc] init];
     
     return self;
@@ -278 +277 @@
     [MIMEToDescription release];
     [MIMEToExtensions release];
-    [extensionToMIME release];
 
     if (cfBundle)
@@ -328 +326 @@
 }
 
-- (BOOL)supportsExtension:(NSString *)extension
-{
-    return [extensionToMIME objectForKey:extension] != 0;
+- (BOOL)supportsExtension:(const String&)extension
+{
+    ASSERT(extension.lower() == extension);
+    
+    for (size_t i = 0; i < mimeTypes.size(); ++i) {
+        const MimeClassInfo& mimeClassInfo = mimeTypes[i];
+        
+        for (size_t j = 0; i < mimeClassInfo.extensions.size(); ++j) {
+            if (mimeClassInfo.extensions[j] == extension)
+                return YES;
+        }
+    }
+
+    return NO;
 }
 
@@ -343 +352 @@
 }
 
-- (NSString *)MIMETypeForExtension:(NSString *)extension
-{
-    return [extensionToMIME objectForKey:extension];
+- (NSString *)MIMETypeForExtension:(const String&)extension
+{
+    ASSERT(extension.lower() == extension);
+    
+    for (size_t i = 0; i < mimeTypes.size(); ++i) {
+        const MimeClassInfo& mimeClassInfo = mimeTypes[i];
+        
+        for (size_t j = 0; j < mimeClassInfo.extensions.size(); ++j) {
+            if (mimeClassInfo.extensions[j] == extension)
+                return mimeClassInfo.type;
+        }
+    }
+
+    return nil;
 }
 
@@ -363 +383 @@
     [MIMEToExtensions release];
     MIMEToExtensions = [MIMEToExtensionsDictionary retain];
-
-    // Reverse the mapping
-    [extensionToMIME removeAllObjects];
-
-    NSEnumerator *MIMEEnumerator = [MIMEToExtensions keyEnumerator], *extensionEnumerator;
-    NSString *MIME, *extension;
-    NSArray *extensions;
-    
-    while ((MIME = [MIMEEnumerator nextObject]) != nil) {
-        extensions = [MIMEToExtensions objectForKey:MIME];
-        extensionEnumerator = [extensions objectEnumerator];
-
-        while ((extension = [extensionEnumerator nextObject]) != nil) {
-            if (![extension isEqualToString:@""])
-                [extensionToMIME setObject:MIME forKey:extension];
-        }
-    }
 }