Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: Source/WebCore/platform/TouchpadFlingPlatformGestureCurve.h

Issue 9931004: Merge 112364 - [chromium] Transfer wheel fling via WebCompositorInputHandlerClient (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/platform/TouchpadFlingPlatformGestureCurve.h
===================================================================
--- Source/WebCore/platform/TouchpadFlingPlatformGestureCurve.h (revision 112613)
+++ Source/WebCore/platform/TouchpadFlingPlatformGestureCurve.h (working copy)
@@ -41,15 +41,15 @@
// the initial velocity.
class TouchpadFlingPlatformGestureCurve : public PlatformGestureCurve {
public:
- static PassOwnPtr<PlatformGestureCurve> create(const FloatPoint& velocity);
- static PassOwnPtr<PlatformGestureCurve> create(const FloatPoint& velocity, const float unitTimeScaleLog10, const FloatPoint& bezierP1, const FloatPoint& bezierP2);
+ static PassOwnPtr<PlatformGestureCurve> create(const FloatPoint& velocity, IntPoint cumulativeScroll = IntPoint());
+ static PassOwnPtr<PlatformGestureCurve> create(const FloatPoint& velocity, const float unitTimeScaleLog10, const FloatPoint& bezierP1, const FloatPoint& bezierP2, IntPoint cumulativeScroll = IntPoint());
virtual ~TouchpadFlingPlatformGestureCurve();
virtual const char* debugName() const { return "TouchpadFling"; }
virtual bool apply(double monotonicTime, PlatformGestureCurveTarget*);
private:
- explicit TouchpadFlingPlatformGestureCurve(const FloatPoint& velocity, const float unitTimeScaleLog10, const FloatPoint& bezierP1, const FloatPoint& bezierP2);
+ TouchpadFlingPlatformGestureCurve(const FloatPoint& velocity, const float unitTimeScaleLog10, const FloatPoint& bezierP1, const FloatPoint& bezierP2, const IntPoint& cumulativeScroll);
FloatPoint m_velocity;
float m_timeScaleFactor;

Powered by Google App Engine
This is Rietveld 408576698