Changeset 60593 in webkit

Timestamp:

Jun 2, 2010 7:37:58 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-02 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Simon Hausmann.

[Qt] Shared platform plugin
​https://bugs.webkit.org/show_bug.cgi?id=39968

Allow several instances of class QtPlatformPlugin to share the QWebKitPlatformPlugin
object provided by a plugin.

Updated plugin interface version number due to ABI breaking change.

• Api/qwebkitplatformplugin.h: (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):
• WebCoreSupport/QtPlatformPlugin.cpp: (WebCore::QtPlatformPlugin::load): (WebCore::QtPlatformPlugin::~QtPlatformPlugin): (WebCore::QtPlatformPlugin::plugin):
• WebCoreSupport/QtPlatformPlugin.h:
• examples/platformplugin/qwebkitplatformplugin.h: (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):

Location:

trunk/WebKit/qt

Files:

• Api/qwebkitplatformplugin.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/QtPlatformPlugin.cpp (modified) (2 diffs)
• WebCoreSupport/QtPlatformPlugin.h (modified) (2 diffs)
• examples/platformplugin/qwebkitplatformplugin.h (modified) (2 diffs)

trunk/WebKit/qt/Api/qwebkitplatformplugin.h

@@ -62 +62 @@
 {
 public:
-    inline ~QWebKitPlatformPlugin() {}
+    virtual ~QWebKitPlatformPlugin() {}
 
     enum Extension {
@@ -68 +68 @@
     };
 
+    virtual bool supportsExtension(Extension extension) const = 0;
     virtual QWebSelectMethod* createSelectInputMethod() const = 0;
-    virtual bool supportsExtension(Extension extension) const = 0;
 
 };
 
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.0");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.1");
 
 #endif // QWEBKITPLATFORMPLUGIN_H

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-06-02  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Shared platform plugin
+        https://bugs.webkit.org/show_bug.cgi?id=39968
+
+        Allow several instances of class QtPlatformPlugin to share the QWebKitPlatformPlugin
+        object provided by a plugin.
+
+        Updated plugin interface version number due to ABI breaking change.
+
+        * Api/qwebkitplatformplugin.h:
+        (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):
+        * WebCoreSupport/QtPlatformPlugin.cpp:
+        (WebCore::QtPlatformPlugin::load):
+        (WebCore::QtPlatformPlugin::~QtPlatformPlugin):
+        (WebCore::QtPlatformPlugin::plugin):
+        * WebCoreSupport/QtPlatformPlugin.h:
+        * examples/platformplugin/qwebkitplatformplugin.h:
+        (QWebKitPlatformPlugin::~QWebKitPlatformPlugin):
+
 2010-06-02  Raine Makelainen  <raine.makelainen@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp

@@ -86 +86 @@
 // QtPlatformPlugin
 
-static QWebKitPlatformPlugin* getPluginObject()
+bool QtPlatformPlugin::load(const QString& file)
+{
+    m_loader.setFileName(file);
+    if (!m_loader.load())
+        return false;
+
+    QObject* obj = m_loader.instance();
+    if (obj) {
+        m_plugin = qobject_cast<QWebKitPlatformPlugin*>(obj);
+        if (m_plugin)
+            return true;
+    }
+
+    m_loader.unload();
+    return false;
+}
+
+bool QtPlatformPlugin::load()
 {
     const QLatin1String suffix("/webkit/");
     const QStringList paths = QCoreApplication::libraryPaths();
-    QObject* obj = 0;
-    for (int i = 0; !obj && i < paths.count(); ++i) {
+
+    for (int i = 0; i < paths.count(); ++i) {
         const QDir dir(paths[i] + suffix);
         if (!dir.exists())
             continue;
         const QStringList files = dir.entryList(QDir::Files);
-        for (int i = 0; i < files.count(); ++i) {
-            QPluginLoader pluginLoader(dir.absoluteFilePath(files.at(i)));
-            if (!pluginLoader.load())
-                continue;
-            obj = pluginLoader.instance();
-            if (obj) {
-                QWebKitPlatformPlugin* result = qobject_cast<QWebKitPlatformPlugin*>(obj);
-                if (result)
-                    return result;
-                delete obj;
-            }
-            pluginLoader.unload();
+        for (int j = 0; j < files.count(); ++j) {
+            if (load(dir.absoluteFilePath(files.at(j))))
+                return true;
         }
     }
-    return 0;
+    return false;
 }
 
 QtPlatformPlugin::~QtPlatformPlugin()
 {
-    delete m_plugin;
+    m_loader.unload();
 }
 
@@ -122 +130 @@
     if (m_loaded)
         return m_plugin;
+    m_loaded = true;
 
-    m_loaded = true;
-    m_plugin = getPluginObject();
+    // Plugin path is stored in a static variable to avoid searching for the plugin
+    // more then once.
+    static QString pluginPath;
+
+    if (pluginPath.isNull()) {
+        if (load())
+            pluginPath = m_loader.fileName();
+    } else
+        load(pluginPath);
+
     return m_plugin;
 }

trunk/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h

@@ -24 +24 @@
 #include "QtAbstractWebPopup.h"
 #include <QObject>
+#include <QPluginLoader>
 
 class QWebSelectMethod;
@@ -56 +57 @@
     bool m_loaded;
     QWebKitPlatformPlugin* m_plugin;
+    QPluginLoader m_loader;
+    bool load();
+    bool load(const QString& file);
 
     QWebKitPlatformPlugin* plugin();

trunk/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h

@@ -62 +62 @@
 {
 public:
-    inline ~QWebKitPlatformPlugin() {}
+    virtual ~QWebKitPlatformPlugin() {}
 
     enum Extension {
@@ -68 +68 @@
     };
 
+    virtual bool supportsExtension(Extension extension) const = 0;
     virtual QWebSelectMethod* createSelectInputMethod() const = 0;
-    virtual bool supportsExtension(Extension extension) const = 0;
 
 };
 
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.0");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.1");
 
 #endif // QWEBKITPLATFORMPLUGIN_H