[webkit-changes] [130963] branches/chromium/1271/Source/WebCore/platform/ TouchFlingPlatformGestureCurve.cpp

[wjmaclean]

Title: [130963] branches/chromium/1271/Source/WebCore/platform/TouchFlingPlatformGestureCurve.cpp

Revision

130963

Author

wjmacl...@chromium.org

Date

2012-10-10 14:36:03 -0700 (Wed, 10 Oct 2012)

Log Message

Merge 130846 - [chromium] revert fling deacceleration parameter change
https://bugs.webkit.org/show_bug.cgi?id=98820

Reviewed by Adrienne Walker.

After an extended discussion, it has been decided that a previous
adjustment to fling deacceleration parameters should be reverted.

Tested by existing unit tests.

* platform/TouchFlingPlatformGestureCurve.cpp:
(WebCore::TouchFlingPlatformGestureCurve::createForTouchPad):
(WebCore::TouchFlingPlatformGestureCurve::createForTouchScreen):


TBR=rjkro...@chromium.org
Review URL: https://codereview.chromium.org/11085056

Modified Paths

• branches/chromium/1271/Source/WebCore/platform/TouchFlingPlatformGestureCurve.cpp

Diff

Modified: branches/chromium/1271/Source/WebCore/platform/TouchFlingPlatformGestureCurve.cpp (130962 => 130963)

--- branches/chromium/1271/Source/WebCore/platform/TouchFlingPlatformGestureCurve.cpp	2012-10-10 21:33:01 UTC (rev 130962)
+++ branches/chromium/1271/Source/WebCore/platform/TouchFlingPlatformGestureCurve.cpp	2012-10-10 21:36:03 UTC (rev 130963)
@@ -56,13 +56,13 @@
 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)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes