| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 | 104 |
| 105 static double curveAt(Curve, double t); | 105 static double curveAt(Curve, double t); |
| 106 static double attackCurve(Curve, double deltaT, double curveT, double st
artPos, double attackPos); | 106 static double attackCurve(Curve, double deltaT, double curveT, double st
artPos, double attackPos); |
| 107 static double releaseCurve(Curve, double deltaT, double curveT, double r
eleasePos, double desiredPos); | 107 static double releaseCurve(Curve, double deltaT, double curveT, double r
eleasePos, double desiredPos); |
| 108 static double coastCurve(Curve, double factor); | 108 static double coastCurve(Curve, double factor); |
| 109 | 109 |
| 110 static double curveIntegralAt(Curve, double t); | 110 static double curveIntegralAt(Curve, double t); |
| 111 static double attackArea(Curve, double startT, double endT); | 111 static double attackArea(Curve, double startT, double endT); |
| 112 static double releaseArea(Curve, double startT, double endT); | 112 static double releaseArea(Curve, double startT, double endT); |
| 113 | 113 |
| 114 double newScrollAnimationPosition(double deltaTime); |
| 115 |
| 114 float* m_currentPosition; | 116 float* m_currentPosition; |
| 115 double m_currentVelocity; | 117 double m_currentVelocity; |
| 116 | 118 |
| 117 double m_desiredPosition; | 119 double m_desiredPosition; |
| 118 double m_desiredVelocity; | 120 double m_desiredVelocity; |
| 119 | 121 |
| 120 double m_startPosition; | 122 double m_startPosition; |
| 121 double m_startTime; | 123 double m_startTime; |
| 122 double m_startVelocity; | 124 double m_startVelocity; |
| 123 | 125 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 145 PerAxisData m_horizontalData; | 147 PerAxisData m_horizontalData; |
| 146 PerAxisData m_verticalData; | 148 PerAxisData m_verticalData; |
| 147 | 149 |
| 148 double m_startTime; | 150 double m_startTime; |
| 149 bool m_animationActive; | 151 bool m_animationActive; |
| 150 }; | 152 }; |
| 151 | 153 |
| 152 } // namespace WebCore | 154 } // namespace WebCore |
| 153 | 155 |
| 154 #endif // ScrollAnimatorNone_h | 156 #endif // ScrollAnimatorNone_h |
| OLD | NEW |