Changeset 61454 in webkit

Timestamp:

Jun 18, 2010 4:51:31 PM (14 years ago)

Author:

andersca@apple.com

Message:

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

Reviewed by Sam Weinig.

Get rid of the NSEnumerators from WebBasePluginPackage
​https://bugs.webkit.org/show_bug.cgi?id=40868

• Plugins/WebBasePluginPackage.h:
• Plugins/WebBasePluginPackage.mm: (-[WebBasePluginPackage MIMETypes]): (-[WebBasePluginPackage supportsExtension:]): (-[WebBasePluginPackage supportsMIMEType:]):
• Plugins/WebPluginDatabase.mm: (-[WebPluginDatabase pluginForMIMEType:]): (-[WebPluginDatabase pluginForExtension:]): (-[WebPluginDatabase refresh]): (-[WebPluginDatabase _removePlugin:]):
• WebCoreSupport/WebPlatformStrategies.mm: (WebPlatformStrategies::getPluginInfo):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebBasePluginPackage.h (modified) (1 diff)
• Plugins/WebBasePluginPackage.mm (modified) (1 diff)
• Plugins/WebPluginDatabase.mm (modified) (3 diffs)
• WebCoreSupport/WebPlatformStrategies.mm (modified) (2 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-06-18  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Get rid of the NSEnumerators from WebBasePluginPackage
+        https://bugs.webkit.org/show_bug.cgi?id=40868
+
+        * Plugins/WebBasePluginPackage.h:
+        * Plugins/WebBasePluginPackage.mm:
+        (-[WebBasePluginPackage MIMETypes]):
+        (-[WebBasePluginPackage supportsExtension:]):
+        (-[WebBasePluginPackage supportsMIMEType:]):
+        * Plugins/WebPluginDatabase.mm:
+        (-[WebPluginDatabase pluginForMIMEType:]):
+        (-[WebPluginDatabase pluginForExtension:]):
+        (-[WebPluginDatabase refresh]):
+        (-[WebPluginDatabase _removePlugin:]):
+        * WebCoreSupport/WebPlatformStrategies.mm:
+        (WebPlatformStrategies::getPluginInfo):
+
 2010-06-18  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/mac/Plugins/WebBasePluginPackage.h

@@ -83 +83 @@
 - (NSBundle *)bundle;
 
-- (NSEnumerator *)extensionEnumerator;
-- (NSEnumerator *)MIMETypeEnumerator;
+- (BOOL)supportsExtension:(NSString *)extension;
+- (BOOL)supportsMIMEType:(NSString *)MIMEType;
+
+- (NSArray *)MIMETypes;
+
 - (NSString *)descriptionForMIMEType:(NSString *)MIMEType;
 - (NSString *)MIMETypeForExtension:(NSString *)extension;

trunk/WebKit/mac/Plugins/WebBasePluginPackage.mm

@@ -304 +304 @@
 }
 
-- (NSEnumerator *)extensionEnumerator
-{
-    return [extensionToMIME keyEnumerator];
-}
-
-- (NSEnumerator *)MIMETypeEnumerator
-{
-    return [MIMEToExtensions keyEnumerator];
+- (NSArray *)MIMETypes
+{
+    return [MIMEToExtensions allKeys];
+}
+
+- (BOOL)supportsExtension:(NSString *)extension
+{
+    return [extensionToMIME objectForKey:extension] != 0;
+}
+
+- (BOOL)supportsMIMEType:(NSString *)MIMEType
+{
+    return [MIMEToExtensions objectForKey:MIMEType] != 0;
 }
 

trunk/WebKit/mac/Plugins/WebPluginDatabase.mm

@@ -155 +155 @@
 };
 
-- (WebBasePluginPackage *)pluginForKey:(NSString *)key withEnumeratorSelector:(SEL)enumeratorSelector
+- (WebBasePluginPackage *)pluginForMIMEType:(NSString *)MIMEType
 {
     PluginPackageCandidates candidates;
-    WebBasePluginPackage *plugin = nil;
-
-    key = [key lowercaseString];
+    
+    MIMEType = [MIMEType lowercaseString];
     NSEnumerator *pluginEnumerator = [plugins objectEnumerator];
-
-    while ((plugin = [pluginEnumerator nextObject]) != nil) {
-        if ([[[plugin performSelector:enumeratorSelector] allObjects] containsObject:key])
+    
+    while (WebBasePluginPackage *plugin = [pluginEnumerator nextObject]) {
+        if ([plugin supportsMIMEType:MIMEType])
             candidates.update(plugin);
     }
-
+    
     return candidates.bestCandidate();
 }
 
-- (WebBasePluginPackage *)pluginForMIMEType:(NSString *)MIMEType
-{
-    return [self pluginForKey:[MIMEType lowercaseString]
-       withEnumeratorSelector:@selector(MIMETypeEnumerator)];
-}
-
 - (WebBasePluginPackage *)pluginForExtension:(NSString *)extension
 {
-    WebBasePluginPackage *plugin = [self pluginForKey:[extension lowercaseString]
-                               withEnumeratorSelector:@selector(extensionEnumerator)];
+    PluginPackageCandidates candidates;
+    
+    extension = [extension lowercaseString];
+    NSEnumerator *pluginEnumerator = [plugins objectEnumerator];
+    
+    while (WebBasePluginPackage *plugin = [pluginEnumerator nextObject]) {
+        if ([plugin supportsExtension:extension])
+            candidates.update(plugin);
+    }
+    
+    WebBasePluginPackage *plugin = candidates.bestCandidate();
+    
     if (!plugin) {
         // If no plug-in was found from the extension, attempt to map from the extension to a MIME type
@@ -303 +306 @@
     pluginEnumerator = [plugins objectEnumerator];
     while ((plugin = [pluginEnumerator nextObject]) != nil)
-        [MIMETypes addObjectsFromArray:[[plugin MIMETypeEnumerator] allObjects]];
+        [MIMETypes addObjectsFromArray:[plugin MIMETypes]];
     
     // Register plug-in views and representations.
@@ -437 +440 @@
 
     // Unregister plug-in's MIME type registrations
-    NSEnumerator *MIMETypeEnumerator = [plugin MIMETypeEnumerator];
-    NSString *MIMEType;
-    while ((MIMEType = [MIMETypeEnumerator nextObject])) {
+    NSArray *MIMETypes = [plugin MIMETypes];
+    for (NSUInteger i = 0; i < [MIMETypes count]; ++i) {
+        NSString *MIMEType = [MIMETypes objectAtIndex:i];
+
         if ([registeredMIMETypes containsObject:MIMEType]) {
             if (self == sharedDatabase)

trunk/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm

@@ -32 +32 @@
 
 #ifdef BUILDING_ON_TIGER
--typedef unsigned NSUInteger;
+typedef unsigned NSUInteger;
 #endif
 
@@ -73 +73 @@
         pluginInfo.desc = [plugin pluginDescription];
 
-        NSEnumerator* MIMETypeEnumerator = [plugin MIMETypeEnumerator];
-        while (NSString* MIME = [MIMETypeEnumerator nextObject]) {
-            MimeClassInfo mime;
+        NSArray *MIMETypes = [plugin MIMETypes];
+        for (NSUInteger i = 0; i < [MIMETypes count]; ++i) {
+            NSString *MIMEType = [MIMETypes objectAtIndex:i];
 
-            mime.type = String(MIME).lower();
+            MimeClassInfo mimeClassInfo;
+
+            mimeClassInfo.type = String(MIMEType).lower();
             
-            NSArray *extensions = [plugin extensionsForMIMEType:MIME];
+            NSArray *extensions = [plugin extensionsForMIMEType:MIMEType];
             for (NSUInteger i = 0; i < [extensions count]; ++i) {
                 NSString *extension = [extensions objectAtIndex:i];
-                mime.extensions.append(extension);
+                mimeClassInfo.extensions.append(extension);
             }
 
-            mime.desc = [plugin descriptionForMIMEType:MIME];
+            mimeClassInfo.desc = [plugin descriptionForMIMEType:MIMEType];
             
-            pluginInfo.mimes.append(mime);
+            pluginInfo.mimes.append(mimeClassInfo);
         }