Changeset 86076 in webkit

Timestamp:

May 9, 2011 12:07:42 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-09 Anders Carlsson <​andersca@apple.com>

Reviewed by John Sullivan.

Clean up NetscapePluginModule::getPluginInfo
​https://bugs.webkit.org/show_bug.cgi?id=60486

Make all 'get' functions take a PluginInfoStore::Plugin reference, since getPluginInfoFromPropertyLists
is going to need it to know the path and plug-in architecture.

• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm: (WebKit::getPluginArchitecture): (WebKit::getPluginInfoFromPropertyLists): (WebKit::getPluginInfoFromCarbonResources): (WebKit::NetscapePluginModule::getPluginInfo):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (12 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-09  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Clean up NetscapePluginModule::getPluginInfo
+        https://bugs.webkit.org/show_bug.cgi?id=60486
+
+        Make all 'get' functions take a PluginInfoStore::Plugin reference, since getPluginInfoFromPropertyLists
+        is going to need it to know the path and plug-in architecture.
+
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        (WebKit::getPluginArchitecture):
+        (WebKit::getPluginInfoFromPropertyLists):
+        (WebKit::getPluginInfoFromCarbonResources):
+        (WebKit::NetscapePluginModule::getPluginInfo):
+
 2011-05-09  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

@@ -34 +34 @@
 namespace WebKit {
 
-static bool getPluginArchitecture(CFBundleRef bundle, cpu_type_t& pluginArchitecture)
+static bool getPluginArchitecture(CFBundleRef bundle, PluginInfoStore::Plugin& plugin)
 {
     RetainPtr<CFArrayRef> pluginArchitecturesArray(AdoptCF, CFBundleCopyExecutableArchitectures(bundle));
@@ -54 +54 @@
     // We only support 64-bit Intel plug-ins on 64-bit Intel.
     if (architectures.contains(kCFBundleExecutableArchitectureX86_64)) {
-        pluginArchitecture = CPU_TYPE_X86_64;
+        plugin.pluginArchitecture = CPU_TYPE_X86_64;
         return true;
     }
@@ -60 +60 @@
     // We also support 32-bit Intel plug-ins on 64-bit Intel.
     if (architectures.contains(kCFBundleExecutableArchitectureI386)) {
-        pluginArchitecture = CPU_TYPE_X86;
+        plugin.pluginArchitecture = CPU_TYPE_X86;
         return true;
     }
@@ -66 +66 @@
     // We only support 32-bit Intel plug-ins on 32-bit Intel.
     if (architectures.contains(kCFBundleExecutableArchitectureI386)) {
-        pluginArchitecture = CPU_TYPE_X86;
+        plugin.pluginArchitecture = CPU_TYPE_X86;
         return true;
     }
@@ -72 +72 @@
     // We only support 64-bit PPC plug-ins on 64-bit PPC.
     if (architectures.contains(kCFBundleExecutableArchitecturePPC64)) {
-        pluginArchitecture = CPU_TYPE_POWERPC64;
+        plugin.pluginArchitecture = CPU_TYPE_POWERPC64;
         return true;
     }
@@ -78 +78 @@
     // We only support 32-bit PPC plug-ins on 32-bit PPC.
     if (architectures.contains(kCFBundleExecutableArchitecturePPC)) {
-        pluginArchitecture = CPU_TYPE_POWERPC;
+        plugin.pluginArchitecture = CPU_TYPE_POWERPC;
         return true;
     }
@@ -112 +112 @@
 }
 
-static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfo& pluginInfo)
+static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfoStore::Plugin& plugin)
 {
     RetainPtr<CFDictionaryRef> mimeTypes = getMIMETypesFromPluginBundle(bundle);
@@ -121 +121 @@
     CFStringRef pluginName = static_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginName")));
     if (pluginName && CFGetTypeID(pluginName) == CFStringGetTypeID())
-        pluginInfo.name = pluginName;
+        plugin.info.name = pluginName;
     
     // Get the plug-in description.
     CFStringRef pluginDescription = static_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginDescription")));
     if (pluginDescription && CFGetTypeID(pluginDescription) == CFStringGetTypeID())
-        pluginInfo.desc = pluginDescription;
+        plugin.info.desc = pluginDescription;
     
     // Get the MIME type mapping dictionary.
@@ -191 +191 @@
 
         // Add this MIME type.
-        pluginInfo.mimes.append(mimeClassInfo);
+        plugin.info.mimes.append(mimeClassInfo);
     }
 
@@ -269 +269 @@
 static const ResID MIMEListStringStringNumber = 128;
 
-static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& pluginInfo)
+static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfoStore::Plugin& plugin)
 {
     ResourceMap resourceMap(bundle);
@@ -311 +311 @@
             mimeClassInfo.extensions.append(extensions[i].lower());
 
-        pluginInfo.mimes.append(mimeClassInfo);
+        plugin.info.mimes.append(mimeClassInfo);
     }
 
     // Set the description and name if they exist.
     if (descriptionAndName.size() > 0)
-        pluginInfo.desc = descriptionAndName[0];
+        plugin.info.desc = descriptionAndName[0];
     if (descriptionAndName.size() > 1)
-        pluginInfo.name = descriptionAndName[1];
+        plugin.info.name = descriptionAndName[1];
 
     return true;
@@ -340 +340 @@
     
     // Check that the architecture is valid.
-    cpu_type_t pluginArchitecture = 0;
-    if (!getPluginArchitecture(bundle.get(), pluginArchitecture))
-        return false;
-    
-    // Check that there's valid info for this plug-in.
-    if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info) &&
-        !getPluginInfoFromCarbonResources(bundle.get(), plugin.info))
-        return false;
-    
+    if (!getPluginArchitecture(bundle.get(), plugin))
+        return false;
+
     plugin.path = pluginPath;
-    plugin.pluginArchitecture = pluginArchitecture;
     plugin.bundleIdentifier = CFBundleGetIdentifier(bundle.get());
     plugin.versionNumber = CFBundleGetVersionNumber(bundle.get());
+    
+    // Check that there's valid info for this plug-in.
+    if (!getPluginInfoFromPropertyLists(bundle.get(), plugin) &&
+        !getPluginInfoFromCarbonResources(bundle.get(), plugin))
+        return false;
     
     RetainPtr<CFStringRef> filename(AdoptCF, CFURLCopyLastPathComponent(bundleURL.get()));