OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011, Google Inc. All rights reserved. | 2 * Copyright (c) 2011, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 | 105 |
106 double m_attackPosition; | 106 double m_attackPosition; |
107 double m_attackTime; | 107 double m_attackTime; |
108 Curve m_attackCurve; | 108 Curve m_attackCurve; |
109 | 109 |
110 double m_releasePosition; | 110 double m_releasePosition; |
111 double m_releaseTime; | 111 double m_releaseTime; |
112 Curve m_releaseCurve; | 112 Curve m_releaseCurve; |
113 | 113 |
114 ScrollbarOrientation m_orientation; | 114 ScrollbarOrientation m_orientation; |
115 Timer<ScrollAnimatorNone> m_animationTimer; | |
116 }; | 115 }; |
117 | 116 |
118 void animationTimerFired(Timer<ScrollAnimatorNone>*); | 117 void animationTimerFired(Timer<ScrollAnimatorNone>*); |
119 void stopAnimationTimerIfNeeded(PerAxisData*); | 118 void stopAnimationTimerIfNeeded(); |
120 | 119 |
121 PerAxisData m_horizontalData; | 120 PerAxisData m_horizontalData; |
122 PerAxisData m_verticalData; | 121 PerAxisData m_verticalData; |
| 122 |
| 123 double m_startTime; |
| 124 Timer<ScrollAnimatorNone> m_animationTimer; |
123 }; | 125 }; |
124 | 126 |
125 } // namespace WebCore | 127 } // namespace WebCore |
126 | 128 |
127 #endif // ENABLE(SMOOTH_SCROLLING) | 129 #endif // ENABLE(SMOOTH_SCROLLING) |
128 | 130 |
129 #endif // ScrollAnimatorNone_h | 131 #endif // ScrollAnimatorNone_h |
OLD | NEW |