diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h index a75d5b138..0a51d9b27 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h @@ -52,9 +52,17 @@ class WebPluginSiteDataManager; class WebProcessProxy; struct PluginProcessCreationParameters; -class PluginProcessProxy : CoreIPC::Connection::Client, ProcessLauncher::Client { +#if PLUGIN_ARCHITECTURE(X11) +struct RawPluginMetaData { + String name; + String description; + String mimeDescription; +}; +#endif + +class PluginProcessProxy : public RefCounted<PluginProcessProxy>, CoreIPC::Connection::Client, ProcessLauncher::Client { public: - static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginModuleInfo&); + static PassRefPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginModuleInfo&); ~PluginProcessProxy(); const PluginModuleInfo& pluginInfo() const { return m_pluginInfo; } @@ -80,6 +88,10 @@ public: static bool createPropertyListFile(const PluginModuleInfo&); #endif +#if PLUGIN_ARCHITECTURE(X11) + static bool scanPlugin(const String& pluginPath, RawPluginMetaData& result); +#endif + private: PluginProcessProxy(PluginProcessManager*, const PluginModuleInfo&); |
