--- a/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -18,8 +18,8 @@
 
 // INCLUDE FILES
 #include <../bidi.h>
-#include <aknAppUi.h>
-#include <aknutils.h>
+#include <aknappui.h>
+#include <AknUtils.h>
 #include "StaticObjectsContainer.h"
 #include "WebCannedImages.h"
 #include "WebPageFullScreenHandler.h"
@@ -28,8 +28,9 @@
 
 using namespace WebCore;
 
-const int KFullScreenButtonOffset = 50;
-const int KFullScreenButtonBuff  = 15;
+const int KFullScreenButtonHeight = 60;
+const int KFullScreenButtonWidth = 60;
+const int KFullScreenButtonBuff  = 5;
 
 // -----------------------------------------------------------------------------
 // WebPageFullScreenHandler::NewL
@@ -65,9 +66,6 @@
     m_buttonIcon = StaticObjectsContainer::instance()->webCannedImages()->getImage(WebCannedImages::EImageEscFullScreen);
     TPoint pos = CalculatePosition();
     BaseConstructL(m_webView, pos, m_buttonIcon.m_img, m_buttonIcon.m_msk, ETrue);
-     if (AknLayoutUtils::PenEnabled()) {
-         DrawableWindow()->SetPointerGrab(ETrue);
-     }
     Hide();   
 }
 
@@ -91,13 +89,6 @@
     return pos;
 }
 
-TSize WebPageFullScreenHandler::CalculateSize()
-{
-    TSize size = m_buttonIcon.m_img->SizeInPixels();
-    size += TSize(KFullScreenButtonBuff, KFullScreenButtonBuff);
-    return size;
-}
-
 //-------------------------------------------------------------------------------
 // WebPageFullScreenHandler::showEscBtnL
 // Draws the full screen button on the screen
@@ -132,8 +123,6 @@
     if (AknLayoutUtils::PenEnabled()) {
         TPoint pos = CalculatePosition();
         SetPos(pos);
-        TSize size = CalculateSize();
-        SetSizeWithoutNotification(size);
     }
 }
 
@@ -158,18 +147,11 @@
 
        case TPointerEvent::EButton1Up:
            {
-           	TPoint fsPostion = PositionRelativeToScreen();
-            TRect fsRect = TRect(fsPostion,Size());
-            fsRect = TRect(fsRect.iTl - TPoint(KFullScreenButtonOffset,KFullScreenButtonOffset), fsRect.iBr);
-           	TPoint pointerPosition = fsPostion + aPointerEvent.iPosition;
-           	if( fsRect.Contains(pointerPosition))
-           	{
-             if (m_isTouchDown) {
-                  Hide();
-                  m_webView->notifyFullscreenModeChangeL( false );
-               }
-               m_isTouchDown = EFalse;
-            }
+           if (m_isTouchDown) {
+               Hide();
+               m_webView->notifyFullscreenModeChangeL( false );
+           }
+           m_isTouchDown = EFalse;
            }
            break;          
         }