Changeset 89256 in webkit

Timestamp:

Jun 20, 2011 10:49:13 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-06-20 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[UNIX] Don't use WebCore::PluginPackage to get plugin information
​https://bugs.webkit.org/show_bug.cgi?id=62899

The problem is that both PluginPackage in WebCore and
NetscapePluginModule in webkit2 install their own netscape browser
functions and that can cause conflicts in some situations.

• Shared/Plugins/Netscape/NetscapePluginModule.h: Add helper function to set plugin mime type descriptions.
• Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp: (WebKit::NetscapePluginModule::setMIMEDescription): Helper function to set plugin mime type descriptions. (WebKit::NetscapePluginModule::getPluginInfo): Use NetscapePluginModule instead of PluginPackage.
• UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: Remove unneeded header include.
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: (WebKit::NPN_GetValue): Do not try to get the XDisplay if the plugin doesn't have a view. It fixes a crash with flash plugin and matches WebCore.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/NetscapePluginModule.h (modified) (1 diff)
• Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (modified) (3 diffs)
• UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [UNIX] Don't use WebCore::PluginPackage to get plugin information
+        https://bugs.webkit.org/show_bug.cgi?id=62899
+
+        The problem is that both PluginPackage in WebCore and
+        NetscapePluginModule in webkit2 install their own netscape browser
+        functions and that can cause conflicts in some situations.
+
+        * Shared/Plugins/Netscape/NetscapePluginModule.h: Add helper
+        function to set plugin mime type descriptions.
+        * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+        (WebKit::NetscapePluginModule::setMIMEDescription): Helper
+        function to set plugin mime type descriptions.
+        (WebKit::NetscapePluginModule::getPluginInfo): Use
+        NetscapePluginModule instead of PluginPackage.
+        * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: Remove unneeded
+        header include.
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_GetValue): Do not try to get the XDisplay if the
+        plugin doesn't have a view. It fixes a crash with flash plugin and
+        matches WebCore.
+
 2011-06-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -69 +69 @@
 #if PLUGIN_ARCHITECTURE(X11)
     void applyX11QuirksBeforeLoad();
+    static void setMIMEDescription(const String& mimeDescription, PluginModuleInfo&);
 #endif
 

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

@@ -29 +29 @@
 #include "NetscapePluginModule.h"
 
-#include "PluginDatabase.h"
-#include "PluginPackage.h"
+#include "NetscapeBrowserFuncs.h"
+#include <WebCore/FileSystem.h>
 
 #if PLATFORM(QT)
@@ -94 +94 @@
 }
 
+void NetscapePluginModule::setMIMEDescription(const String& mimeDescription, PluginModuleInfo& plugin)
+{
+    Vector<String> types;
+    mimeDescription.lower().split(UChar(';'), false, types);
+    plugin.info.mimes.reserveCapacity(types.size());
+
+    size_t mimeInfoCount = 0;
+    for (size_t i = 0; i < types.size(); ++i) {
+        Vector<String> mimeTypeParts;
+        types[i].split(UChar(':'), true, mimeTypeParts);
+        if (mimeTypeParts.size() <= 0)
+            continue;
+
+        plugin.info.mimes.uncheckedAppend(MimeClassInfo());
+        MimeClassInfo& mimeInfo = plugin.info.mimes[mimeInfoCount++];
+        mimeInfo.type = mimeTypeParts[0];
+
+        if (mimeTypeParts.size() > 1)
+            mimeTypeParts[1].split(UChar(','), false, mimeInfo.extensions);
+
+        if (mimeTypeParts.size() > 2)
+            mimeInfo.desc = mimeTypeParts[2];
+    }
+}
+
 bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
 {
@@ -102 +127 @@
     // We are loading the plugin here since it does not seem to be a standardized way to
     // get the needed informations from a UNIX plugin without loading it.
-
-    RefPtr<PluginPackage> package = PluginPackage::createPackage(pluginPath, 0 /*lastModified*/);
-    if (!package)
+    RefPtr<NetscapePluginModule> pluginModule = NetscapePluginModule::getOrCreate(pluginPath);
+    if (!pluginModule)
         return false;
 
     plugin.path = pluginPath;
-    plugin.info.desc = package->description();
-    plugin.info.file = package->fileName();
+    plugin.info.file = pathGetFileName(pluginPath);
 
-    const MIMEToDescriptionsMap& descriptions = package->mimeToDescriptions();
-    const MIMEToExtensionsMap& extensions = package->mimeToExtensions();
-    MIMEToDescriptionsMap::const_iterator descEnd = descriptions.end();
-    plugin.info.mimes.reserveCapacity(descriptions.size());
-    unsigned i = 0;
-    for (MIMEToDescriptionsMap::const_iterator it = descriptions.begin(); it != descEnd; ++it) {
-        plugin.info.mimes.uncheckedAppend(MimeClassInfo());
-        MimeClassInfo& mime = plugin.info.mimes[i++];
-        mime.type = it->first;
-        mime.desc = it->second;
-        MIMEToExtensionsMap::const_iterator extensionIt = extensions.find(it->first);
-        ASSERT(extensionIt != extensions.end());
-        mime.extensions = extensionIt->second;
-    }
+    Module* module = pluginModule->module();
+    NPP_GetValueProcPtr NPP_GetValue = module->functionPointer<NPP_GetValueProcPtr>("NP_GetValue");
+    if (!NPP_GetValue)
+        return false;
 
-    package->unload();
+    NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = module->functionPointer<NP_GetMIMEDescriptionFuncPtr>("NP_GetMIMEDescription");
+    if (!NP_GetMIMEDescription)
+        return false;
+
+    char* buffer = 0;
+    NPError err = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
+    if (err == NPERR_NO_ERROR)
+        plugin.info.desc = buffer;
+
+    const char* mimeDescription = NP_GetMIMEDescription();
+    if (!mimeDescription)
+        return false;
+
+    setMIMEDescription(mimeDescription, plugin);
+
     return true;
 }

trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp

@@ -31 +31 @@
 #include "NetscapePluginModule.h"
 #include "PluginDatabase.h"
-#include "PluginPackage.h"
 
 using namespace WebCore;

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp

@@ -504 +504 @@
            break;
 #elif PLUGIN_ARCHITECTURE(X11)
-       case NPNVxDisplay:
+       case NPNVxDisplay: {
+           RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
+           if (!plugin)
+               return NPERR_GENERIC_ERROR;
 #if PLATFORM(QT)
            *reinterpret_cast<Display**>(value) = QX11Info::display();
@@ -514 +517 @@
            goto default;
 #endif
+       }
        case NPNVSupportsXEmbedBool:
            *static_cast<NPBool*>(value) = true;