Merge 130846 - [chromium] revert fling deacceleration parameter change

Source/WebCore/platform/TouchFlingPlatformGestureCurve.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 38 matching lines @@
 // to start at zero (and thus are implicitly scaled).
 //
 // The curve is modelled as a 4th order polynomial, starting at t = 0, and ending at t = m_curveDuration.
 // Attempts to generate position/velocity estimates outside this range are undefined.
 
 static const int cMaxSearchIterations = 20;
 
 PassOwnPtr<PlatformGestureCurve> TouchFlingPlatformGestureCurve::createForTouchPad(const FloatPoint& velocity, IntPoint cumulativeScroll)
 {
     // The default parameters listed below are a matched set, and should not be changed independently of one another.
-    return create(velocity, -1.5e+02, 10, 1.5e+00, 2.075, cumulativeScroll);
+    return create(velocity, -5.70762e+03, 1.72e+02, 3.7e+00, 1.3, cumulativeScroll);
 }
 
 PassOwnPtr<PlatformGestureCurve> TouchFlingPlatformGestureCurve::createForTouchScreen(const FloatPoint& velocity, IntPoint cumulativeScroll)
 {
     // The touchscreen-specific parameters listed below are a matched set, and should not be changed independently of one another.
-    return create(velocity, -1.5e+02, 10, 1.5e+00, 2.075, cumulativeScroll);
+    return create(velocity, -5.70762e+03, 1.72e+02, 3.7e+00, 1.3, cumulativeScroll);
 }
 
 PassOwnPtr<PlatformGestureCurve> TouchFlingPlatformGestureCurve::create(const FloatPoint& velocity, float p0, float p1, float p2, float curveDuration, IntPoint cumulativeScroll)
 {
     return adoptPtr(new TouchFlingPlatformGestureCurve(velocity, p0, p1, p2, curveDuration, cumulativeScroll));
 }
 
 inline double position(double t, float* p)
 {
     return p[0] * exp(-p[2] * t) - p[1] * t - p[0];
@@ skipping 77 matching lines @@
 
     if (time + m_timeOffset < m_curveDuration || scrollIncrement != IntPoint::zero()) {
         target->scrollBy(scrollIncrement);
         return true;
     }
 
     return false;
 }
 
 } // namespace WebCore