Merge 92639 - Scroll animator changes to nail the framerate

Source/WebCore/platform/ScrollAnimatorNone.h

 /*
  * Copyright (c) 2011, 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:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 94 matching lines @@
 
         double m_attackPosition;
         double m_attackTime;
         Curve m_attackCurve;
 
         double m_releasePosition;
         double m_releaseTime;
         Curve m_releaseCurve;
 
         ScrollbarOrientation m_orientation;
-        Timer<ScrollAnimatorNone> m_animationTimer;
     };
 
     void animationTimerFired(Timer<ScrollAnimatorNone>*);
-    void stopAnimationTimerIfNeeded(PerAxisData*);
+    void stopAnimationTimerIfNeeded();
 
     PerAxisData m_horizontalData;
     PerAxisData m_verticalData;
+
+    double m_startTime;
+    Timer<ScrollAnimatorNone> m_animationTimer;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(SMOOTH_SCROLLING)
 
 #endif // ScrollAnimatorNone_h