--- a/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h	Tue Aug 31 16:17:46 2010 +0300
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <coedef.h>
 #include <w32std.h>
-#include <stmgestureinterface.h>
+#include <rt_gesturehelper.h>
 #include "WebScrollingDecelerator.h"
 
 
@@ -175,18 +175,17 @@
         * return
         */
         WebScrollbarDrawer*  scrollbarDrawer() {return m_scrollbarDrawer;}
-        
-        WebScrollingDeceleratorGH* ScrollingDeceleratorGH() {return m_decelGH;} 
 
         //callbacks
         static int pageOverviewScrollCallback( TAny* aPtr );
         //static int handleScrollTimerEventCallback( TAny* ptr);
         void scrollPageOverviewGH();
-        void handleScrollingGH(const TStmGestureEvent& aGesture);
-        void handleTouchDownGH(const TStmGestureEvent& aGesture);
-        void handleTouchUpGH(const TStmGestureEvent& aGesture);
+        void handleScrollingGH(const RT_GestureHelper::TGestureEvent& aEvent);
+        void handleTouchDownGH(const RT_GestureHelper::TGestureEvent& aEvent);
+        void handleTouchUpGH(const RT_GestureHelper::TGestureEvent& aEvent);
         void updateScrollbars(const TPoint& scrollPos, TPoint& newscrollDelta);
-        void stopScrolling();
+
+public:
 
      private:
         void calculateScrollDirection(int absX, int absY);
@@ -194,7 +193,7 @@
         bool calculateScrollableElement(const TPoint& aNewPosition);
         
         void scrollPageOverview(const TPointerEvent& pointerEvent);
-        bool startDeceleration(const TStmGestureEvent& aGesture);
+        bool startDeceleration(const RT_GestureHelper::TGestureEvent& aEvent);
         
      private:  
         // Pointer to owning view
@@ -213,7 +212,7 @@
         TTime m_lastMoveEventTime;
         TTime m_pageOverviewEventTime;
         WebScrollingDecelerator* m_decel;
-        WebScrollingDeceleratorGH* m_decelGH; 
+	WebScrollingDeceleratorGH* m_decelGH; 
         TPointerEvent m_lastDragEvent;
         CPeriodic* m_scrollTimer;
         ScrollableView m_scrollableView;