--- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.h	Tue Feb 02 00:56:45 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.h	Fri Mar 19 09:52:28 2010 +0200
@@ -20,9 +20,8 @@
 
 #include <e32base.h>
 #include <w32std.h>
-#include <stmgestureinterface.h>
 #include "Timer.h"
-
+#include <rt_gesturehelper.h>
 
 namespace WebCore
 {
@@ -32,9 +31,8 @@
 
 class WebView;
 class CActiveSchedulerWait;
-class WebGestureInterface;
 
-class WebPointerEventHandler : public CBase
+class WebPointerEventHandler : public CBase, public RT_GestureHelper::MGestureObserver
 {
 public:
     static WebPointerEventHandler* NewL(WebView* view);     
@@ -44,7 +42,9 @@
 public:
     void HandlePointerEventL(const TPointerEvent& aPointerEvent);
     void HandleHighlightChange(const TPoint &aPoint);
-    void HandleGestureEventL(const TStmGestureEvent& aGesture);
+
+    virtual void HandleGestureL( const RT_GestureHelper::TGestureEvent& aEvent );
+    
     
 private:    
     bool checkForEventListener(WebCore::Node* node);
@@ -54,15 +54,13 @@
     bool isHighlitableElement(TBrCtlDefs::TBrCtlElementType& elType);
     TBrCtlDefs::TBrCtlElementType highlitableElement();
     void buttonDownTimerCB(WebCore::Timer<WebPointerEventHandler>* t);
-    void handleTouchDownL(const TStmGestureEvent& aGesture);
-    void handleTouchUp(const TStmGestureEvent& aGesture);
-    void handleTapL(const TStmGestureEvent& aGesture);
-    void handleDoubleTap(const TStmGestureEvent& aGesture);
-    void handleMove(const TStmGestureEvent& aGesture);
+    void handleTouchDownL(const RT_GestureHelper::TGestureEvent& aEvent);
+    void handleTouchUp(const RT_GestureHelper::TGestureEvent& aEvent);
+    void handleTapL(const RT_GestureHelper::TGestureEvent& aEvent);
+    void handleDoubleTap(const RT_GestureHelper::TGestureEvent& aEvent);
+    void handleMove(const RT_GestureHelper::TGestureEvent& aEvent);
     void doTapL();
     void updateCursor(const TPoint& pos);
-    void setFocusRing();
-    void handlePinchZoomL(const TStmGestureEvent& aGesture);
 private:
     WebPointerEventHandler(WebView* view);            
     WebView* m_webview;
@@ -79,10 +77,10 @@
     TPointerEvent m_currentEvent;
     WebCore::Timer<WebPointerEventHandler> m_buttonDownTimer; 
     
+    RT_GestureHelper::CGestureHelper* m_gestureHelper;
     TPointerEvent m_lastPointerEvent;
     bool   m_ignoreTap; 
     CActiveSchedulerWait*    m_waiter; 
-    WebGestureInterface*  m_gestureInterface; 
     
 };