Changeset 96400 in webkit

Timestamp:

Sep 30, 2011 7:23:43 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

[UNIX] Add a method to get information for an already loaded plugin module
​https://bugs.webkit.org/show_bug.cgi?id=69139

Reviewed by Martin Robinson.

• Shared/Plugins/Netscape/NetscapePluginModule.h: Add pluginInfo().
• Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:

(WebKit::NetscapePluginModule::pluginInfo): Private method to get
the plugin information from the module, it must be called when the
module has been already initialized.
(WebKit::NetscapePluginModule::getPluginInfo): Use pluginInfo() to
get information of the plugin module for the given path.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/NetscapePluginModule.h (modified) (1 diff)
• Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-30  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [UNIX] Add a method to get information for an already loaded plugin module
+        https://bugs.webkit.org/show_bug.cgi?id=69139
+
+        Reviewed by Martin Robinson.
+
+        * Shared/Plugins/Netscape/NetscapePluginModule.h: Add pluginInfo().
+        * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+        (WebKit::NetscapePluginModule::pluginInfo): Private method to get
+        the plugin information from the module, it must be called when the
+        module has been already initialized.
+        (WebKit::NetscapePluginModule::getPluginInfo): Use pluginInfo() to
+        get information of the plugin module for the given path.
+
 2011-09-30  Zeno Albisser  <zeno.albisser@nokia.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h

@@ -70 +70 @@
     void applyX11QuirksBeforeLoad();
     static void setMIMEDescription(const String& mimeDescription, PluginModuleInfo&);
+    bool pluginInfo(PluginModuleInfo&);
 #endif
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp

@@ -119 +119 @@
 }
 
+bool NetscapePluginModule::pluginInfo(PluginModuleInfo& plugin)
+{
+    ASSERT(m_isInitialized);
+
+    plugin.path = m_pluginPath;
+    plugin.info.file = pathGetFileName(m_pluginPath);
+
+    Module* module = m_module.get();
+    NPP_GetValueProcPtr NPP_GetValue = module->functionPointer<NPP_GetValueProcPtr>("NP_GetValue");
+    if (!NPP_GetValue)
+        return false;
+
+    NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = module->functionPointer<NP_GetMIMEDescriptionFuncPtr>("NP_GetMIMEDescription");
+    if (!NP_GetMIMEDescription)
+        return false;
+
+    char* buffer;
+    NPError error = NPP_GetValue(0, NPPVpluginNameString, &buffer);
+    if (error == NPERR_NO_ERROR)
+        plugin.info.name = buffer;
+
+    error = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
+    if (error == NPERR_NO_ERROR)
+        plugin.info.desc = buffer;
+
+    const char* mimeDescription = NP_GetMIMEDescription();
+    if (!mimeDescription)
+        return false;
+
+    setMIMEDescription(mimeDescription, plugin);
+
+    return true;
+}
 bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
 {
@@ -132 +165 @@
 
     pluginModule->incrementLoadCount();
-
-    plugin.path = pluginPath;
-    plugin.info.file = pathGetFileName(pluginPath);
-
-    Module* module = pluginModule->module();
-    NPP_GetValueProcPtr NPP_GetValue = module->functionPointer<NPP_GetValueProcPtr>("NP_GetValue");
-    if (!NPP_GetValue) {
-        pluginModule->decrementLoadCount();
-        return false;
-    }
-
-    NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = module->functionPointer<NP_GetMIMEDescriptionFuncPtr>("NP_GetMIMEDescription");
-    if (!NP_GetMIMEDescription) {
-        pluginModule->decrementLoadCount();
-        return false;
-    }
-
-    char* buffer;
-    NPError error = NPP_GetValue(0, NPPVpluginNameString, &buffer);
-    if (error == NPERR_NO_ERROR)
-        plugin.info.name = buffer;
-
-    error = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
-    if (error == NPERR_NO_ERROR)
-        plugin.info.desc = buffer;
-
-    const char* mimeDescription = NP_GetMIMEDescription();
-    if (!mimeDescription) {
-        pluginModule->decrementLoadCount();
-        return false;
-    }
-
-    setMIMEDescription(mimeDescription, plugin);
-
+    bool returnValue = pluginModule->pluginInfo(plugin);
     pluginModule->decrementLoadCount();
 
-    return true;
+    return returnValue;
 }