Merge 112364 - [chromium] Transfer wheel fling via WebCompositorInputHandlerClient

Source/WebCore/platform/ActivePlatformGestureAnimation.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 23 matching lines @@
 #include "TraceEvent.h"
 #endif
 
 namespace WebCore {
 
 PassOwnPtr<ActivePlatformGestureAnimation> ActivePlatformGestureAnimation::create(PassOwnPtr<PlatformGestureCurve> curve, PlatformGestureCurveTarget* target)
 {
     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)
     TRACE_EVENT_FINISH0("input", "GestureAnimation", this);
 #endif
 }
 
 ActivePlatformGestureAnimation::ActivePlatformGestureAnimation(PassOwnPtr<PlatformGestureCurve> curve, PlatformGestureCurveTarget* target)
     : m_startTime(0)
     , m_waitingForFirstTick(true)
     , m_curve(curve)
     , m_target(target)
 {
 #if PLATFORM(CHROMIUM)
     TRACE_EVENT_START1("input", "GestureAnimation", this, "curve", m_curve->debugName());
 #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) {
         m_startTime = time;
         m_waitingForFirstTick = false;
     }
     // All PlatformGestureCurves assume zero-based time, so we subtract
     // the animation start time before passing to the curve.
     return m_curve->apply(time - m_startTime, m_target);
 }
 
 } // namespace WebCore