diff -r a1a5d4e727e8 -r 800203832575 webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h --- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h Wed Jun 09 10:52:50 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h Mon Jun 21 16:54:17 2010 +0300 @@ -32,6 +32,7 @@ #include "WebFrameView.h" #include "WebView.h" #include +#include //#include // FORWARD DECLARATIONS @@ -416,9 +417,9 @@ void setElement(WebCore::Element* aElement) {m_element = aElement;} void reCreatePlugin(); TInt activeStreams() { return m_streams.size(); } - void PlayPauseNotify(bool pause); TPluginLoadMode getLoadMode(){return m_loadmode;} void setLoadMode(TPluginLoadMode mode){m_loadmode = mode;} + void NotifyPluginsForScrollOrPinch(bool status); public: // from MMemoryCollector TUint Collect(unsigned int aRequired); void Restore() {} @@ -436,6 +437,8 @@ return iGenericElementArray; } void setPluginWinClipedRect(); + TBool IsCollectBitmapSupported(); + WebFrame* getWebFrame() const {return m_frame;} private: // private member data TRect frameVisibleRect() const; @@ -444,6 +447,7 @@ const TDesC& GetExecutionMode(); void setupGenericElementArrrayL(); void addWidgetAttributesL(); + void activateVisiblePlugins(); // Window-owning CoeControl which wraps the CoeControl created by the plugin PluginWin* m_pluginwin; WebFrame* m_frame; // not owned @@ -480,6 +484,7 @@ TRect m_oldRect; TRect m_oldViewport; TPluginLoadMode m_loadmode; + NPObject* m_NPObject; public: TInt m_handle;