diff -r e1bea15f9a39 -r 79859ed3eea9 webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h --- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h Thu Aug 19 10:58:56 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h Tue Aug 31 16:17:46 2010 +0300 @@ -31,8 +31,7 @@ #include "WebFrame.h" #include "WebFrameView.h" #include "WebView.h" -#include -#include +#include "MemoryManager.h" //#include // FORWARD DECLARATIONS @@ -201,18 +200,6 @@ TBool isBrowserScheme(const TPtrC8& url); /** - * HandleLosingForeground - * Handles losing Foreground event - */ - void HandleLosingForeground(); - - /** - * HandleLosingForeground - * Handles Gaining Foreground event - */ - void HandleGainingForeground(); - - /** * * GetLoadMode * Returns the load mode associated with the "window-type". @@ -427,9 +414,7 @@ TInt handleNetworkAccess() const; WebCore::Element* getElement() {return m_element;} void setElement(WebCore::Element* aElement) {m_element = aElement;} - void reCreatePlugin(); - TInt activeStreams() { return m_streams.size(); } - void NotifyPluginsForScrollOrPinch(bool status); + public: // from MMemoryCollector TUint Collect(unsigned int aRequired); void Restore() {} @@ -446,16 +431,8 @@ RArray* genericElementArray(){ return iGenericElementArray; } + private: // private member data void setPluginWinClipedRect(); - TBool isFlashPlugin(){ - return m_flashContent; - } - TBool IsCollectBitmapSupported(); - WebFrame* getWebFrame() const {return m_frame;} - void activateVisiblePlugins(); - - private: // private member data - TRect frameVisibleRect() const; void Close(); @@ -497,8 +474,8 @@ RArray* iGenericElementArray; TRect m_oldRect; TRect m_oldViewport; - NPObject* m_NPObject; + public: TInt m_handle; NPP m_instance;