--- a/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.cpp	Tue Feb 02 00:56:45 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.cpp	Fri Mar 19 09:52:28 2010 +0200
@@ -28,6 +28,7 @@
 
 #include "WebKitLogger.h"
 
+using namespace RT_GestureHelper;
 // constants
 const int KRecordSize = 4;
 
@@ -37,9 +38,7 @@
 
 const int KScrollIntervalTimeout = 60000; // scroll timer interval in microseconds
 
-const float KDeccelerationLow = -350.0;
-const float KDeccelerationHigh = -600.0;
-const float KSpeedHigh = 2000.0;
+const float KDecceleration = -700.0;
 
 int decelTimerCB(TAny* ptr);
 
@@ -79,7 +78,6 @@
 void WebScrollingDeceleratorGH::ConstructL()
 {
     m_decelTimer = CPeriodic::NewL(CActive::EPriorityStandard);
-    m_deceleration = KDeccelerationHigh;
 }
 
 // -----------------------------------------------------------------------------
@@ -93,7 +91,7 @@
 
 int WebScrollingDeceleratorGH::getDecceleration()
 {
-   return  m_deceleration;  
+   return  KDecceleration;  
 }
 
 
@@ -116,22 +114,8 @@
 {
     m_decelelatorSwitch = true;
     m_scrollbarDrawer = scrollbarDrawer;
-    float speedX = speed.iX;
-    float speedY = speed.iY;
-    float absSpeedX = abs(speedX);
-    float absSpeedY = abs(speedY);
-    
-    if (absSpeedX > KSpeedHigh) {
-        speedX = KSpeedHigh * speedX/absSpeedX ;
-        m_deceleration = KDeccelerationLow;
-    }
-    if (absSpeedY > KSpeedHigh) {
-        speedY = KSpeedHigh * speedY/absSpeedY;
-        m_deceleration = KDeccelerationLow;
-    }
-    
-    m_initSpeed.iX = (-1) * speedX;
-    m_initSpeed.iY = (-1) * speedY;
+    m_initSpeed.iX = (-1) * speed.iX;
+    m_initSpeed.iY = (-1) * speed.iY;
     
     m_numscrollsteps = 0;
     if (m_decelTimer->IsActive()) {
@@ -161,16 +145,14 @@
     TReal32 accelX = 0.0;
     TReal32 accelY = 0.0;
     
-    TReal32 deceleration = getDecceleration();
-    
     if (m_initSpeed.iX) {
-        accelX = (m_initSpeed.iX > 0) ?  deceleration : (-1) * deceleration;
+        accelX = (m_initSpeed.iX > 0) ?  KDecceleration : (-1) * KDecceleration;
         vx = m_initSpeed.iX + accelX * t;
         dx = m_initSpeed.iX * t + 0.5 * accelX * (t * t);
     }
         
     if (m_initSpeed.iY) {
-        accelY = (m_initSpeed.iY > 0) ?  deceleration : (-1) * deceleration;
+        accelY = (m_initSpeed.iY > 0) ?  KDecceleration : (-1) * KDecceleration;
         vy = m_initSpeed.iY + accelY * t;
         dy = m_initSpeed.iY * t + 0.5 * accelY * (t * t);
     }