Merge 113095 - [chromium] Switch touchpad fling curve physics to absolute (not scaled) curve.

Source/WebKit/chromium/tests/PlatformGestureCurveTest.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
@@ skipping 81 matching lines @@
     EXPECT_TRUE(animation->animate(0.45));
     EXPECT_TRUE(animation->animate(0.75));
     EXPECT_TRUE(animation->animate(1000));
     EXPECT_FALSE(animation->animate(1001));
     EXPECT_NEAR(target.cumulativeDelta().x(), 50, 1);
     EXPECT_NEAR(target.cumulativeDelta().y(), 150, 1);
 }
 
 TEST(PlatformGestureCurve, flingCurveTouch)
 {
-    double initialVelocity = 1000;
-    const double touchFlingCurveAreaFactor = 1; // Depends on parameterization in TouchpadFlingPlatformGestureCurve.
+    double initialVelocity = 5000;
     MockPlatformGestureCurveTarget target;
     OwnPtr<ActivePlatformGestureAnimation> animation = ActivePlatformGestureAnimation::create(TouchpadFlingPlatformGestureCurve::create(FloatPoint(initialVelocity, 0)), &target);
 
-    // Note: the expectations below are dependent on the value of sigma hard-coded in the Rayleigh
-    //       curve. If sigma changes, these test expectations will also change.
+    // Note: the expectations below are dependent on the value of sigma hard-coded in the curve parameters.
+    //       If the parameters change, then the tests values/expectations will need to be updated.
     EXPECT_TRUE(animation->animate(0));
     EXPECT_TRUE(animation->animate(0.25));
     EXPECT_TRUE(animation->animate(0.45)); // Use non-uniform tick spacing.
-    EXPECT_TRUE(animation->animate(0.75));
-    EXPECT_TRUE(animation->animate(0.9));
-    EXPECT_TRUE(animation->animate(1000));
-    EXPECT_FALSE(animation->animate(1001));
-    EXPECT_NEAR(target.cumulativeDelta().x(), initialVelocity * touchFlingCurveAreaFactor, 1);
+    EXPECT_TRUE(animation->animate(1));
+    EXPECT_FALSE(animation->animate(1.5));
+    EXPECT_NEAR(target.cumulativeDelta().x(), 1094, 1);
     EXPECT_EQ(target.cumulativeDelta().y(), 0);
 }
 
 } // namespace anonymous