diff -r dd21522fd290 -r 7c90e6132015 webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h --- a/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h Mon Mar 30 12:54:55 2009 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h Fri May 08 08:25:06 2009 +0300 @@ -21,10 +21,11 @@ #define PluginHandler_H // INCLUDES +#include #include #include #include - +#include #include // ecom #include "EcomBrowserPluginInterface.h" #include "WebCorePluginHandler.h" @@ -32,7 +33,7 @@ // FORWARD DECLARATIONS class PluginInfo; class WebView; - +class PluginSkin; // CLASS DECLARATION @@ -136,6 +137,13 @@ * @return ETrue or EFalse. */ TBool isSupported(const TDesC& contType, const TDesC8& url); + void storePluginObject(PluginSkin* pluginObj); + void removePluginObject(PluginSkin* pluginObj); + WTF::HashSet& pluginObjects() { return m_pluginObjects; }; + PluginSkin* pluginToActivate() { return m_pluginToActivate; }; + void setPluginToActivate(PluginSkin* pluginObj) {m_pluginToActivate = pluginObj; }; + PluginSkin* activePlugin() { return m_activePlugin; }; + void setActivePlugin(PluginSkin* pluginObj) { m_activePlugin = pluginObj; }; private: // New functions @@ -181,6 +189,7 @@ // Array of information about existing plugins RPointerArray m_pluginInfoArray; + WTF::HashSet m_pluginObjects; TInt m_nextHandle; TBool m_pluginsLoaded; TBool m_enablePlugins; @@ -189,6 +198,8 @@ CIdle* m_idle; //Active Object to initailise //the plugins from drives + PluginSkin* m_pluginToActivate; + PluginSkin* m_activePlugin; };