--- a/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.h Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.h Tue Aug 31 16:17:46 2010 +0300
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <coedef.h>
#include <w32std.h>
-#include <stmgesturelistener.h>
+#include <rt_gestureobserver.h>
// MACROS
@@ -60,7 +60,7 @@
public: // Main functions
- bool startDecel(TRealPoint& speed, WebScrollbarDrawer* scrollbarDrawer);
+ void startDecel(RT_GestureHelper::TRealPoint& speed, WebScrollbarDrawer* scrollbarDrawer);
void cancelDecel();
@@ -85,7 +85,7 @@
//normalized current position to minimize rounding error
TPoint m_normalizedCurrentPosition;
- TRealPoint m_initSpeed;
+ RT_GestureHelper::TRealPoint m_initSpeed;
CPeriodic* m_decelTimer;
@@ -94,8 +94,6 @@
TPoint m_startPos;
WebScrollbarDrawer* m_scrollbarDrawer;
-
- TReal32 m_deceleration;
};