diff -r 79859ed3eea9 -r 919f36ff910f webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h --- a/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h Tue Aug 31 16:17:46 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h Wed Sep 01 12:28:30 2010 +0100 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "WebScrollingDecelerator.h" @@ -175,17 +175,18 @@ * 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 RT_GestureHelper::TGestureEvent& aEvent); - void handleTouchDownGH(const RT_GestureHelper::TGestureEvent& aEvent); - void handleTouchUpGH(const RT_GestureHelper::TGestureEvent& aEvent); + void handleScrollingGH(const TStmGestureEvent& aGesture); + void handleTouchDownGH(const TStmGestureEvent& aGesture); + void handleTouchUpGH(const TStmGestureEvent& aGesture); void updateScrollbars(const TPoint& scrollPos, TPoint& newscrollDelta); - -public: + void stopScrolling(); private: void calculateScrollDirection(int absX, int absY); @@ -193,7 +194,7 @@ bool calculateScrollableElement(const TPoint& aNewPosition); void scrollPageOverview(const TPointerEvent& pointerEvent); - bool startDeceleration(const RT_GestureHelper::TGestureEvent& aEvent); + bool startDeceleration(const TStmGestureEvent& aGesture); private: // Pointer to owning view @@ -212,7 +213,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;