Merge 92002 - Scroll animation refinements.

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 41 matching lines @@
 
     enum Curve {
         Linear,
         Quadratic,
         Cubic,
         Bounce
     };
 
     struct Parameters {
         Parameters();
-        Parameters(bool, double, Curve, double, Curve, double);
+        Parameters(bool isEnabled, double animationTime, double repeatMinimumSustainTime, Curve attackCurve, double attackTime, Curve releaseCurve, double releaseTime);
 
         // Note that the times can be overspecified such that releaseTime or releaseTime and attackTime are greater
         // than animationTime. animationTime takes priority over releaseTime, capping it. attackTime is capped at
         // whatever time remains, or zero if none.
         bool m_isEnabled;
         double m_animationTime;
+        double m_repeatMinimumSustainTime;
 
         Curve m_attackCurve;
         double m_attackTime;
 
         Curve m_releaseCurve;
         double m_releaseTime;
     };
 
 protected:
     friend class ::ScrollAnimatorNoneTest;
@@ skipping 40 matching lines @@
 
     PerAxisData m_horizontalData;
     PerAxisData m_verticalData;
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(SMOOTH_SCROLLING)
 
 #endif // ScrollAnimatorNone_h