--- a/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp	Fri May 08 08:25:06 2009 +0300
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp	Fri Jul 03 15:54:40 2009 +0100
@@ -227,8 +227,6 @@
 void PluginWin::processEventL( TPluginEventType eventType,
                                 TBool& consumed )
 {
-	  CBrCtl*   brCtl = control(m_pluginskin->frame());
-	  WebView*  view = brCtl->webView();
     consumed = EFalse;
 
     switch ( eventType ) {
@@ -239,7 +237,6 @@
                     m_notifier->NotifyL( MPluginNotifier::EPluginActivated, (void*) &pt );
                 }
             consumed = ETrue;
-            view->setPluginActivated(true);   //Setting pluginactivated flag in webview
             setPluginFocusL( ETrue );
         break;
 
@@ -249,7 +246,6 @@
                     m_notifier->NotifyL( MPluginNotifier::EPluginDeactivated, (void*) 0 );
                 }
             consumed = ETrue;
-            view->setPluginActivated(false);
             setPluginFocusL( EFalse );
         break;
 
@@ -420,42 +416,6 @@
 {
 }
 
-// -----------------------------------------------------------------------------
-// PluginWin::ViewFocusChanged
-//
-// Invoked by CCoeControl to WebKitView to PluginWin when the Browser focus
-// changes. This method notifies all plugins of thier current focus state.
-// NOTES:
-// iBrowserBackground means that the browser app is not top application,
-// such as when bookmarks, idle screen, or another app/view is in foreground.
-// aFocused is true if browser has focus and false if browser is out of focus
-// and a plugin has taken focus.
-// -----------------------------------------------------------------------------
-void PluginWin::viewFocusChanged( TBool focused )
-{
-if (m_notifier)
-		{
-		if (focused)
-			{
-			// The browser brings back the focus, and so are plugins.
-			    HandleGainingForeground();
-			}
-		else
-			{
-			// The browser doesn't have focus and this plugin focus state is...
-			if ( m_pluginfocus )
-				{
-				// This plugin is selected to be activate, so the focus is on this plugin now.
-				   HandleGainingForeground();
-				}
-			else
-				{
-				// The focus on the plugin is cancelled. This happens when deactivate the selected plugin
-				   HandleLosingForeground();
-				}
-			}
-		}
-}
 
 // -----------------------------------------------------------------------------
 // PluginWin::SetPluginFocusL
@@ -575,18 +535,6 @@
         }
     }
 
-// -----------------------------------------------------------------------------
-// PluginWin::FocusChanged
-//
-// virtual function from CCoeControl for plugin win
-// -----------------------------------------------------------------------------
-//
-void PluginWin::FocusChanged(TDrawNow aDrawNow)
-{
-    if(m_pluginfocus) {
-        m_pluginskin->pluginFocusChanged(IsFocused());
-    }
-}
 
 // -----------------------------------------------------------------------------
 //
@@ -725,11 +673,13 @@
     }
 }
 
-void PluginWin::TogleScreenMode(bool aFullScreen)
+void PluginWin::ToggleScreenMode(bool aFullScreen)
 {
   m_fullscreen = aFullScreen;
   CBrCtl*   brCtl = control(m_pluginskin->frame());
-
+  WebCursor* cursor = StaticObjectsContainer::instance()->webCursor();
+  
+  cursor->cursorUpdate(!aFullScreen && !AknLayoutUtils::PenEnabled());
   StaticObjectsContainer::instance()->setPluginFullscreen(aFullScreen);
   brCtl->reportStateChanged(TBrCtlDefs::EStatePluginFullScreen, m_fullscreen);
 }