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

Unified Diff: Source/WebCore/platform/ActivePlatformGestureAnimation.cpp

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/ActivePlatformGestureAnimation.cpp
===================================================================
--- Source/WebCore/platform/ActivePlatformGestureAnimation.cpp (revision 112613)
+++ Source/WebCore/platform/ActivePlatformGestureAnimation.cpp (working copy)
@@ -41,6 +41,11 @@
return adoptPtr(new ActivePlatformGestureAnimation(curve, target));
}
+PassOwnPtr<ActivePlatformGestureAnimation> ActivePlatformGestureAnimation::create(PassOwnPtr<PlatformGestureCurve> curve, PlatformGestureCurveTarget* target, double startTime)
+{
+ return adoptPtr(new ActivePlatformGestureAnimation(curve, target, startTime));
+}
+
ActivePlatformGestureAnimation::~ActivePlatformGestureAnimation()
{
#if PLATFORM(CHROMIUM)
@@ -59,6 +64,17 @@
#endif
}
+ActivePlatformGestureAnimation::ActivePlatformGestureAnimation(PassOwnPtr<PlatformGestureCurve> curve, PlatformGestureCurveTarget* target, double startTime)
+ : m_startTime(startTime)
+ , m_waitingForFirstTick(false)
+ , m_curve(curve)
+ , m_target(target)
+{
+#if PLATFORM(CHROMIUM)
+ TRACE_EVENT_START1("input", "GestureAnimation", this, "curve", m_curve->debugName());
+#endif
+}
+
bool ActivePlatformGestureAnimation::animate(double time)
{
if (m_waitingForFirstTick) {
« no previous file with comments | « Source/WebCore/platform/ActivePlatformGestureAnimation.h ('k') | Source/WebCore/platform/TouchpadFlingPlatformGestureCurve.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698